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

# Conflicts:
#	PDF Office/ViewModels/ViewContentViewModel.cs
#	PDF Office/Views/Dialog/ToolsDialogs/SaftyDialogs/CheckPasswordDialog.xaml

PDF Office/Model/AnnotPanel/FontBoard.cs

@@ -557,8 +557,12 @@ namespace PDF_Master.Model.AnnotPanel
                     && (annot.FontFamily.Source == item.mFontFamily.Source || annot.FontFamily.Source == "Arial" && item.mFontFamily.Source == "Helvatica")
                     )
                 {
-                    CurrentPresetFont = new ComboDataItem(item.mTag, item.mTagContent);
-                    isExist = true;
+                    if(item.mTag!= "Custom")
+                    {
+                        CurrentPresetFont = new ComboDataItem(item.mTag, item.mTagContent);
+                        isExist = true;
+                    }
+                    
                     break;
                 }
             }

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -648,14 +648,12 @@
           <target state="new">Add Folder</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_Create" translate="yes" xml:space="preserve">
-          <source>Creat PDF for each image</source>
-          <target state="new">Creat PDF for each image</target>
+          <source>Create PDF for each image</source>
+          <target state="new">Create PDF for each image</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_EmptyContext" translate="yes" xml:space="preserve">
-          <source>Select files
-Drop files here or Click “Add Files” in bottom right corner.</source>
-          <target state="new">Select files
-Drop files here or Click “Add Files” in bottom right corner.</target>
+          <source>Drop files here or Click “Add Files” in bottom right corner.</source>
+          <target state="new">Drop files here or Click “Add Files” in bottom right corner.</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_ExportTitle" translate="yes" xml:space="preserve">
           <source>Export</source>
@@ -1118,18 +1116,6 @@ Drag files to reorder as you need.</target>
           <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>
@@ -1147,14 +1133,6 @@ Drag files to reorder as you need.</target>
           <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_FitPage" translate="yes" xml:space="preserve">
           <source>Fit Page</source>
           <target state="new">Fit Page</target>
@@ -1163,26 +1141,10 @@ Drag files to reorder as you need.</target>
           <source>Fit Width</source>
           <target state="new">Fit Width</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>
@@ -1191,26 +1153,14 @@ Drag files to reorder as you need.</target>
           <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_PageDisplay" translate="yes" xml:space="preserve">
           <source>Page Display</source>
           <target state="new">Page Display</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_Print" translate="yes" xml:space="preserve">
           <source>Print</source>
           <target state="new">Print</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>
@@ -1243,18 +1193,6 @@ Drag files to reorder as you need.</target>
           <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_TwoPages" translate="yes" xml:space="preserve">
           <source>Two Pages</source>
           <target state="new">Two Pages</target>
@@ -1263,10 +1201,6 @@ Drag files to reorder as you need.</target>
           <source>Two Pages Continuous</source>
           <target state="new">Two Pages Continuous</target>
         </trans-unit>
-        <trans-unit id="ViewRightMenu_Underline" translate="yes" xml:space="preserve">
-          <source>Underline</source>
-          <target state="new">Underline</target>
-        </trans-unit>
         <trans-unit id="ViewRightMenu_Zoom" translate="yes" xml:space="preserve">
           <source>Zoom</source>
           <target state="new">Zoom</target>
@@ -1445,6 +1379,294 @@ form</target>
           <source>Format</source>
           <target state="new">Format</target>
         </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Arrow" translate="yes" xml:space="preserve">
+          <source>Arrow</source>
+          <target state="new">Arrow</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_StickyNote" translate="yes" xml:space="preserve">
+          <source>Sticky Note</source>
+          <target state="new">Sticky Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_BookMode" translate="yes" xml:space="preserve">
+          <source>Book Mode</source>
+          <target state="new">Book Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_SinglePage" translate="yes" xml:space="preserve">
+          <source>Single Page</source>
+          <target state="new">Single Page</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_SinglePageContinuous" translate="yes" xml:space="preserve">
+          <source>Single Page Continuous</source>
+          <target state="new">Single Page Continuous</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_TwoPage" translate="yes" xml:space="preserve">
+          <source>Two Pages</source>
+          <target state="new">Two Pages</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_TwoPageContinuous" translate="yes" xml:space="preserve">
+          <source>Two Pages Continuous</source>
+          <target state="new">Two Pages Continuous</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ActualSize" translate="yes" xml:space="preserve">
+          <source>Actual Size</source>
+          <target state="new">Actual Size</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_FitPage" translate="yes" xml:space="preserve">
+          <source>Fit Page</source>
+          <target state="new">Fit Page</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_FitWidth" translate="yes" xml:space="preserve">
+          <source>Fit Width</source>
+          <target state="new">Fit Width</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ZoomIn" translate="yes" xml:space="preserve">
+          <source>Zoom In</source>
+          <target state="new">Zoom In</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ZoomOut" translate="yes" xml:space="preserve">
+          <source>Zoom Out</source>
+          <target state="new">Zoom Out</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_AddBookmarks" translate="yes" xml:space="preserve">
+          <source>Add Bookmarks</source>
+          <target state="new">Add Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_AddComment" translate="yes" xml:space="preserve">
+          <source>Add Comment</source>
+          <target state="new">Add Comment</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ContentSelection" translate="yes" xml:space="preserve">
+          <source>Content Selection</source>
+          <target state="new">Content Selection</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_DefaultTool" translate="yes" xml:space="preserve">
+          <source>Default Tool</source>
+          <target state="new">Default Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_HideAnnotations" translate="yes" xml:space="preserve">
+          <source>Hide Annotations</source>
+          <target state="new">Hide Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_HighlightLinks" translate="yes" xml:space="preserve">
+          <source>Highlight Links</source>
+          <target state="new">Highlight Links</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_PageDisPlay" translate="yes" xml:space="preserve">
+          <source>Page DisPlay</source>
+          <target state="new">Page DisPlay</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Print" translate="yes" xml:space="preserve">
+          <source>Print</source>
+          <target state="new">Print</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ReadModeOff" translate="yes" xml:space="preserve">
+          <source>Read Mode Off</source>
+          <target state="new">Read Mode Off</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ReadModeOn" translate="yes" xml:space="preserve">
+          <source>Read Mode On</source>
+          <target state="new">Read Mode On</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_RemoveBookmarks" translate="yes" xml:space="preserve">
+          <source>Remove Bookmarks</source>
+          <target state="new">Remove Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ScrollTool" translate="yes" xml:space="preserve">
+          <source>Scroll Tool</source>
+          <target state="new">Scroll Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Search" translate="yes" xml:space="preserve">
+          <source>Search</source>
+          <target state="new">Search</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ShowAnnotations" translate="yes" xml:space="preserve">
+          <source>Show Annotation</source>
+          <target state="new">Show Annotation</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Tools" translate="yes" xml:space="preserve">
+          <source>Tools</source>
+          <target state="new">Tools</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Zoom" translate="yes" xml:space="preserve">
+          <source>Zoom</source>
+          <target state="new">Zoom</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ZoomtoSelectedArea" translate="yes" xml:space="preserve">
+          <source>Zoom to Selected Area</source>
+          <target state="new">Zoom to Selected Area</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_AddLink" translate="yes" xml:space="preserve">
+          <source>Add Link</source>
+          <target state="new">Add Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_AddOutline" translate="yes" xml:space="preserve">
+          <source>Add Outline</source>
+          <target state="new">Add Outline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Copy" translate="yes" xml:space="preserve">
+          <source>Copy</source>
+          <target state="new">Copy</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_ExtractImage" translate="yes" xml:space="preserve">
+          <source>Extract Image</source>
+          <target state="new">Extract Image</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Highlight" translate="yes" xml:space="preserve">
+          <source>Highlight</source>
+          <target state="new">Highlight</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Note" translate="yes" xml:space="preserve">
+          <source>Note</source>
+          <target state="new">Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Strikethrough" translate="yes" xml:space="preserve">
+          <source>Strikethrough</source>
+          <target state="new">Strikethrough</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Text1" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</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_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_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_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_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_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</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="ViewRightMenuBlankSpaceAddComment_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ImageToPDF_SaveAsPDF" translate="yes" xml:space="preserve">
+          <source>Save as PDF</source>
+          <target state="new">Save as PDF</target>
+        </trans-unit>
+        <trans-unit id="ImageToPDF_SelectFiles" translate="yes" xml:space="preserve">
+          <source>Select files</source>
+          <target state="new">Select files</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf

@@ -648,14 +648,12 @@
           <target state="new">Add Folder</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_Create" translate="yes" xml:space="preserve">
-          <source>Creat PDF for each image</source>
-          <target state="new">Creat PDF for each image</target>
+          <source>Create PDF for each image</source>
+          <target state="new">Create PDF for each image</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_EmptyContext" translate="yes" xml:space="preserve">
-          <source>Select files
-Drop files here or Click “Add Files” in bottom right corner.</source>
-          <target state="new">Select files
-Drop files here or Click “Add Files” in bottom right corner.</target>
+          <source>Drop files here or Click “Add Files” in bottom right corner.</source>
+          <target state="new">Drop files here or Click “Add Files” in bottom right corner.</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_ExportTitle" translate="yes" xml:space="preserve">
           <source>Export</source>
@@ -1118,18 +1116,6 @@ Drag files to reorder as you need.</target>
           <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>
@@ -1147,14 +1133,6 @@ Drag files to reorder as you need.</target>
           <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_FitPage" translate="yes" xml:space="preserve">
           <source>Fit Page</source>
           <target state="new">Fit Page</target>
@@ -1163,26 +1141,10 @@ Drag files to reorder as you need.</target>
           <source>Fit Width</source>
           <target state="new">Fit Width</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>
@@ -1191,26 +1153,14 @@ Drag files to reorder as you need.</target>
           <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_PageDisplay" translate="yes" xml:space="preserve">
           <source>Page Display</source>
           <target state="new">Page Display</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_Print" translate="yes" xml:space="preserve">
           <source>Print</source>
           <target state="new">Print</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>
@@ -1243,18 +1193,6 @@ Drag files to reorder as you need.</target>
           <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_TwoPages" translate="yes" xml:space="preserve">
           <source>Two Pages</source>
           <target state="new">Two Pages</target>
@@ -1263,10 +1201,6 @@ Drag files to reorder as you need.</target>
           <source>Two Pages Continuous</source>
           <target state="new">Two Pages Continuous</target>
         </trans-unit>
-        <trans-unit id="ViewRightMenu_Underline" translate="yes" xml:space="preserve">
-          <source>Underline</source>
-          <target state="new">Underline</target>
-        </trans-unit>
         <trans-unit id="ViewRightMenu_Zoom" translate="yes" xml:space="preserve">
           <source>Zoom</source>
           <target state="new">Zoom</target>
@@ -1445,6 +1379,294 @@ form</target>
           <source>Format</source>
           <target state="new">Format</target>
         </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Arrow" translate="yes" xml:space="preserve">
+          <source>Arrow</source>
+          <target state="new">Arrow</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_StickyNote" translate="yes" xml:space="preserve">
+          <source>Sticky Note</source>
+          <target state="new">Sticky Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_BookMode" translate="yes" xml:space="preserve">
+          <source>Book Mode</source>
+          <target state="new">Book Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_SinglePage" translate="yes" xml:space="preserve">
+          <source>Single Page</source>
+          <target state="new">Single Page</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_SinglePageContinuous" translate="yes" xml:space="preserve">
+          <source>Single Page Continuous</source>
+          <target state="new">Single Page Continuous</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_TwoPage" translate="yes" xml:space="preserve">
+          <source>Two Pages</source>
+          <target state="new">Two Pages</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_TwoPageContinuous" translate="yes" xml:space="preserve">
+          <source>Two Pages Continuous</source>
+          <target state="new">Two Pages Continuous</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ActualSize" translate="yes" xml:space="preserve">
+          <source>Actual Size</source>
+          <target state="new">Actual Size</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_FitPage" translate="yes" xml:space="preserve">
+          <source>Fit Page</source>
+          <target state="new">Fit Page</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_FitWidth" translate="yes" xml:space="preserve">
+          <source>Fit Width</source>
+          <target state="new">Fit Width</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ZoomIn" translate="yes" xml:space="preserve">
+          <source>Zoom In</source>
+          <target state="new">Zoom In</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ZoomOut" translate="yes" xml:space="preserve">
+          <source>Zoom Out</source>
+          <target state="new">Zoom Out</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_AddBookmarks" translate="yes" xml:space="preserve">
+          <source>Add Bookmarks</source>
+          <target state="new">Add Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_AddComment" translate="yes" xml:space="preserve">
+          <source>Add Comment</source>
+          <target state="new">Add Comment</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ContentSelection" translate="yes" xml:space="preserve">
+          <source>Content Selection</source>
+          <target state="new">Content Selection</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_DefaultTool" translate="yes" xml:space="preserve">
+          <source>Default Tool</source>
+          <target state="new">Default Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_HideAnnotations" translate="yes" xml:space="preserve">
+          <source>Hide Annotations</source>
+          <target state="new">Hide Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_HighlightLinks" translate="yes" xml:space="preserve">
+          <source>Highlight Links</source>
+          <target state="new">Highlight Links</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_PageDisPlay" translate="yes" xml:space="preserve">
+          <source>Page DisPlay</source>
+          <target state="new">Page DisPlay</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Print" translate="yes" xml:space="preserve">
+          <source>Print</source>
+          <target state="new">Print</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ReadModeOff" translate="yes" xml:space="preserve">
+          <source>Read Mode Off</source>
+          <target state="new">Read Mode Off</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ReadModeOn" translate="yes" xml:space="preserve">
+          <source>Read Mode On</source>
+          <target state="new">Read Mode On</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_RemoveBookmarks" translate="yes" xml:space="preserve">
+          <source>Remove Bookmarks</source>
+          <target state="new">Remove Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ScrollTool" translate="yes" xml:space="preserve">
+          <source>Scroll Tool</source>
+          <target state="new">Scroll Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Search" translate="yes" xml:space="preserve">
+          <source>Search</source>
+          <target state="new">Search</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ShowAnnotations" translate="yes" xml:space="preserve">
+          <source>Show Annotation</source>
+          <target state="new">Show Annotation</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Tools" translate="yes" xml:space="preserve">
+          <source>Tools</source>
+          <target state="new">Tools</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Zoom" translate="yes" xml:space="preserve">
+          <source>Zoom</source>
+          <target state="new">Zoom</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ZoomtoSelectedArea" translate="yes" xml:space="preserve">
+          <source>Zoom to Selected Area</source>
+          <target state="new">Zoom to Selected Area</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_AddLink" translate="yes" xml:space="preserve">
+          <source>Add Link</source>
+          <target state="new">Add Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_AddOutline" translate="yes" xml:space="preserve">
+          <source>Add Outline</source>
+          <target state="new">Add Outline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Copy" translate="yes" xml:space="preserve">
+          <source>Copy</source>
+          <target state="new">Copy</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_ExtractImage" translate="yes" xml:space="preserve">
+          <source>Extract Image</source>
+          <target state="new">Extract Image</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Highlight" translate="yes" xml:space="preserve">
+          <source>Highlight</source>
+          <target state="new">Highlight</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Note" translate="yes" xml:space="preserve">
+          <source>Note</source>
+          <target state="new">Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Strikethrough" translate="yes" xml:space="preserve">
+          <source>Strikethrough</source>
+          <target state="new">Strikethrough</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Text1" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</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_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_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_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_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_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</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="ViewRightMenuBlankSpaceAddComment_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ImageToPDF_SaveAsPDF" translate="yes" xml:space="preserve">
+          <source>Save as PDF</source>
+          <target state="new">Save as PDF</target>
+        </trans-unit>
+        <trans-unit id="ImageToPDF_SelectFiles" translate="yes" xml:space="preserve">
+          <source>Select files</source>
+          <target state="new">Select files</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf

@@ -648,14 +648,12 @@
           <target state="new">Add Folder</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_Create" translate="yes" xml:space="preserve">
-          <source>Creat PDF for each image</source>
-          <target state="new">Creat PDF for each image</target>
+          <source>Create PDF for each image</source>
+          <target state="new">Create PDF for each image</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_EmptyContext" translate="yes" xml:space="preserve">
-          <source>Select files
-Drop files here or Click “Add Files” in bottom right corner.</source>
-          <target state="new">Select files
-Drop files here or Click “Add Files” in bottom right corner.</target>
+          <source>Drop files here or Click “Add Files” in bottom right corner.</source>
+          <target state="new">Drop files here or Click “Add Files” in bottom right corner.</target>
         </trans-unit>
         <trans-unit id="ImageToPDF_ExportTitle" translate="yes" xml:space="preserve">
           <source>Export</source>
@@ -1118,18 +1116,6 @@ Drag files to reorder as you need.</target>
           <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>
@@ -1147,14 +1133,6 @@ Drag files to reorder as you need.</target>
           <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_FitPage" translate="yes" xml:space="preserve">
           <source>Fit Page</source>
           <target state="new">Fit Page</target>
@@ -1163,26 +1141,10 @@ Drag files to reorder as you need.</target>
           <source>Fit Width</source>
           <target state="new">Fit Width</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>
@@ -1191,26 +1153,14 @@ Drag files to reorder as you need.</target>
           <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_PageDisplay" translate="yes" xml:space="preserve">
           <source>Page Display</source>
           <target state="new">Page Display</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_Print" translate="yes" xml:space="preserve">
           <source>Print</source>
           <target state="new">Print</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>
@@ -1243,18 +1193,6 @@ Drag files to reorder as you need.</target>
           <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_TwoPages" translate="yes" xml:space="preserve">
           <source>Two Pages</source>
           <target state="new">Two Pages</target>
@@ -1263,10 +1201,6 @@ Drag files to reorder as you need.</target>
           <source>Two Pages Continuous</source>
           <target state="new">Two Pages Continuous</target>
         </trans-unit>
-        <trans-unit id="ViewRightMenu_Underline" translate="yes" xml:space="preserve">
-          <source>Underline</source>
-          <target state="new">Underline</target>
-        </trans-unit>
         <trans-unit id="ViewRightMenu_Zoom" translate="yes" xml:space="preserve">
           <source>Zoom</source>
           <target state="new">Zoom</target>
@@ -1445,6 +1379,294 @@ form</target>
           <source>Format</source>
           <target state="new">Format</target>
         </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Arrow" translate="yes" xml:space="preserve">
+          <source>Arrow</source>
+          <target state="new">Arrow</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_StickyNote" translate="yes" xml:space="preserve">
+          <source>Sticky Note</source>
+          <target state="new">Sticky Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceAddComment_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_BookMode" translate="yes" xml:space="preserve">
+          <source>Book Mode</source>
+          <target state="new">Book Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_SinglePage" translate="yes" xml:space="preserve">
+          <source>Single Page</source>
+          <target state="new">Single Page</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_SinglePageContinuous" translate="yes" xml:space="preserve">
+          <source>Single Page Continuous</source>
+          <target state="new">Single Page Continuous</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_TwoPage" translate="yes" xml:space="preserve">
+          <source>Two Pages</source>
+          <target state="new">Two Pages</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpacePageDisPlay_TwoPageContinuous" translate="yes" xml:space="preserve">
+          <source>Two Pages Continuous</source>
+          <target state="new">Two Pages Continuous</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ActualSize" translate="yes" xml:space="preserve">
+          <source>Actual Size</source>
+          <target state="new">Actual Size</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_FitPage" translate="yes" xml:space="preserve">
+          <source>Fit Page</source>
+          <target state="new">Fit Page</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_FitWidth" translate="yes" xml:space="preserve">
+          <source>Fit Width</source>
+          <target state="new">Fit Width</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ZoomIn" translate="yes" xml:space="preserve">
+          <source>Zoom In</source>
+          <target state="new">Zoom In</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpaceViewZoom_ZoomOut" translate="yes" xml:space="preserve">
+          <source>Zoom Out</source>
+          <target state="new">Zoom Out</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_AddBookmarks" translate="yes" xml:space="preserve">
+          <source>Add Bookmarks</source>
+          <target state="new">Add Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_AddComment" translate="yes" xml:space="preserve">
+          <source>Add Comment</source>
+          <target state="new">Add Comment</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ContentSelection" translate="yes" xml:space="preserve">
+          <source>Content Selection</source>
+          <target state="new">Content Selection</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_DefaultTool" translate="yes" xml:space="preserve">
+          <source>Default Tool</source>
+          <target state="new">Default Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_HideAnnotations" translate="yes" xml:space="preserve">
+          <source>Hide Annotations</source>
+          <target state="new">Hide Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_HighlightLinks" translate="yes" xml:space="preserve">
+          <source>Highlight Links</source>
+          <target state="new">Highlight Links</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_PageDisPlay" translate="yes" xml:space="preserve">
+          <source>Page DisPlay</source>
+          <target state="new">Page DisPlay</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Print" translate="yes" xml:space="preserve">
+          <source>Print</source>
+          <target state="new">Print</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ReadModeOff" translate="yes" xml:space="preserve">
+          <source>Read Mode Off</source>
+          <target state="new">Read Mode Off</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ReadModeOn" translate="yes" xml:space="preserve">
+          <source>Read Mode On</source>
+          <target state="new">Read Mode On</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_RemoveBookmarks" translate="yes" xml:space="preserve">
+          <source>Remove Bookmarks</source>
+          <target state="new">Remove Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ScrollTool" translate="yes" xml:space="preserve">
+          <source>Scroll Tool</source>
+          <target state="new">Scroll Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Search" translate="yes" xml:space="preserve">
+          <source>Search</source>
+          <target state="new">Search</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ShowAnnotations" translate="yes" xml:space="preserve">
+          <source>Show Annotation</source>
+          <target state="new">Show Annotation</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Tools" translate="yes" xml:space="preserve">
+          <source>Tools</source>
+          <target state="new">Tools</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_Zoom" translate="yes" xml:space="preserve">
+          <source>Zoom</source>
+          <target state="new">Zoom</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuBlankSpace_ZoomtoSelectedArea" translate="yes" xml:space="preserve">
+          <source>Zoom to Selected Area</source>
+          <target state="new">Zoom to Selected Area</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_AddLink" translate="yes" xml:space="preserve">
+          <source>Add Link</source>
+          <target state="new">Add Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_AddOutline" translate="yes" xml:space="preserve">
+          <source>Add Outline</source>
+          <target state="new">Add Outline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Copy" translate="yes" xml:space="preserve">
+          <source>Copy</source>
+          <target state="new">Copy</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_ExtractImage" translate="yes" xml:space="preserve">
+          <source>Extract Image</source>
+          <target state="new">Extract Image</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Highlight" translate="yes" xml:space="preserve">
+          <source>Highlight</source>
+          <target state="new">Highlight</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Note" translate="yes" xml:space="preserve">
+          <source>Note</source>
+          <target state="new">Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Strikethrough" translate="yes" xml:space="preserve">
+          <source>Strikethrough</source>
+          <target state="new">Strikethrough</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenuSelection_Text1" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</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_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_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_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_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_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</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="ViewRightMenuBlankSpaceAddComment_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ImageToPDF_SaveAsPDF" translate="yes" xml:space="preserve">
+          <source>Save as PDF</source>
+          <target state="new">Save as PDF</target>
+        </trans-unit>
+        <trans-unit id="ImageToPDF_SelectFiles" translate="yes" xml:space="preserve">
+          <source>Select files</source>
+          <target state="new">Select files</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/PDF Master.csproj

@@ -2264,6 +2264,12 @@
     </Content>
     <Resource Include="Resources\PromotionIcon\black_pdfreaderpro_home_en.png" />
     <Resource Include="Resources\PromotionIcon\Mac.png" />
+    <Content Include="Resources\Service\Login.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Resources\Service\Regiserok.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="source\AnalysisWord\Res\word\_rels\document.xml.rels">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

PDF Office/Strings/MainPage/MainPage.Designer.cs

@@ -756,7 +756,7 @@ namespace PDF_Master.Strings.MainPage {
         }
         
         /// <summary>
-        ///   查找类似 Creat PDF for each image 的本地化字符串。
+        ///   查找类似 Create PDF for each image 的本地化字符串。
         /// </summary>
         public static string ImageToPDF_Create {
             get {
@@ -765,8 +765,7 @@ namespace PDF_Master.Strings.MainPage {
         }
         
         /// <summary>
-        ///   查找类似 Select files
-        ///Drop files here or Click “Add Files” in bottom right corner. 的本地化字符串。
+        ///   查找类似 Drop files here or Click “Add Files” in bottom right corner. 的本地化字符串。
         /// </summary>
         public static string ImageToPDF_EmptyContext {
             get {
@@ -819,6 +818,24 @@ namespace PDF_Master.Strings.MainPage {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Save as PDF 的本地化字符串。
+        /// </summary>
+        public static string ImageToPDF_SaveAsPDF {
+            get {
+                return ResourceManager.GetString("ImageToPDF_SaveAsPDF", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Select files 的本地化字符串。
+        /// </summary>
+        public static string ImageToPDF_SelectFiles {
+            get {
+                return ResourceManager.GetString("ImageToPDF_SelectFiles", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Settings 的本地化字符串。
         /// </summary>
@@ -2144,6 +2161,492 @@ namespace PDF_Master.Strings.MainPage {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add Bookmarks 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_AddBookmarks {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_AddBookmarks", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Comment 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_AddComment {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_AddComment", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Content Selection 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_ContentSelection {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_ContentSelection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Default Tool 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_DefaultTool {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_DefaultTool", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Freehand 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_Freehand {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_Freehand", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Hide Annotations 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_HideAnnotations {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_HideAnnotations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Highlight Links 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_HighlightLinks {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_HighlightLinks", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Page DisPlay 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_PageDisPlay {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_PageDisPlay", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Paste 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_Paste {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_Paste", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Print 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_Print {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_Print", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Read Mode Off 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_ReadModeOff {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_ReadModeOff", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Read Mode On 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_ReadModeOn {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_ReadModeOn", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Remove Bookmarks 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_RemoveBookmarks {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_RemoveBookmarks", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Scroll Tool 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_ScrollTool {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_ScrollTool", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Search 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_Search {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_Search", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Show Annotation 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_ShowAnnotations {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_ShowAnnotations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Tools 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_Tools {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_Tools", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Zoom 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_Zoom {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_Zoom", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Zoom to Selected Area 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpace_ZoomtoSelectedArea {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpace_ZoomtoSelectedArea", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Arrow 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_Arrow {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_Arrow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Freehand 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_Freehand {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_Freehand", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Link 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_Link {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_Link", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Oval 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_Oval {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_Oval", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Rectangle 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_Rectangle {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_Rectangle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Signature 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_Signature {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_Signature", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Stamp 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_Stamp {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_Stamp", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Sticky Note 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_StickyNote {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_StickyNote", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Straight Line 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_StraightLine {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_StraightLine", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Text 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceAddComment_Text {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceAddComment_Text", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Book Mode 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpacePageDisPlay_BookMode {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpacePageDisPlay_BookMode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Single Page 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpacePageDisPlay_SinglePage {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpacePageDisPlay_SinglePage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Single Page Continuous 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpacePageDisPlay_SinglePageContinuous {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpacePageDisPlay_SinglePageContinuous", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Two Pages 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpacePageDisPlay_TwoPage {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpacePageDisPlay_TwoPage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Two Pages Continuous 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpacePageDisPlay_TwoPageContinuous {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpacePageDisPlay_TwoPageContinuous", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Actual Size 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceViewZoom_ActualSize {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceViewZoom_ActualSize", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fit Page 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceViewZoom_FitPage {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceViewZoom_FitPage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fit Width 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceViewZoom_FitWidth {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceViewZoom_FitWidth", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Zoom In 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceViewZoom_ZoomIn {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceViewZoom_ZoomIn", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Zoom Out 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuBlankSpaceViewZoom_ZoomOut {
+            get {
+                return ResourceManager.GetString("ViewRightMenuBlankSpaceViewZoom_ZoomOut", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Link 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_AddLink {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_AddLink", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Outline 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_AddOutline {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_AddOutline", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Copy 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Copy {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Copy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Extract Image 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_ExtractImage {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_ExtractImage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Highlight 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Highlight {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Highlight", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Link 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Link {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Link", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Note 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Note {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Note", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Oval 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Oval {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Oval", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Paste 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Paste {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Paste", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Rectangle 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Rectangle {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Rectangle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Straight Line 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_StraightLine {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_StraightLine", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Strikethrough 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Strikethrough {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Strikethrough", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Text 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Text {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Text", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Text 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Text1 {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Text1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Underline 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenuSelection_Underline {
+            get {
+                return ResourceManager.GetString("ViewRightMenuSelection_Underline", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Annotation 的本地化字符串。
         /// </summary>

PDF Office/Strings/MainPage/MainPage.resx

@@ -366,11 +366,10 @@ form</value>
     <value>Add Folder</value>
   </data>
   <data name="ImageToPDF_Create" xml:space="preserve">
-    <value>Creat PDF for each image</value>
+    <value>Create PDF for each image</value>
   </data>
   <data name="ImageToPDF_EmptyContext" xml:space="preserve">
-    <value>Select files
-Drop files here or Click “Add Files” in bottom right corner.</value>
+    <value>Drop files here or Click “Add Files” in bottom right corner.</value>
   </data>
   <data name="ImageToPDF_ExportTitle" xml:space="preserve">
     <value>Export</value>
@@ -388,6 +387,12 @@ Drop files here or Click “Add Files” in bottom right corner.</value>
   <data name="ImageToPDF_Merge" xml:space="preserve">
     <value>Merge as one PDF document</value>
   </data>
+  <data name="ImageToPDF_SaveAsPDF" xml:space="preserve">
+    <value>Save as PDF</value>
+  </data>
+  <data name="ImageToPDF_SelectFiles" xml:space="preserve">
+    <value>Select files</value>
+  </data>
   <data name="ImageToPDF_Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
@@ -729,6 +734,168 @@ Drag files to reorder as you need.</value>
     <value>Two Pages</value>
     <comment>双页模式</comment>
   </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_Arrow" xml:space="preserve">
+    <value>Arrow</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_Freehand" xml:space="preserve">
+    <value>Freehand</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_Link" xml:space="preserve">
+    <value>Link</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_Oval" xml:space="preserve">
+    <value>Oval</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_Rectangle" xml:space="preserve">
+    <value>Rectangle</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_Signature" xml:space="preserve">
+    <value>Signature</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_Stamp" xml:space="preserve">
+    <value>Stamp</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_StickyNote" xml:space="preserve">
+    <value>Sticky Note</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_StraightLine" xml:space="preserve">
+    <value>Straight Line</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceAddComment_Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
+  <data name="ViewRightMenuBlankSpacePageDisPlay_BookMode" xml:space="preserve">
+    <value>Book Mode</value>
+  </data>
+  <data name="ViewRightMenuBlankSpacePageDisPlay_SinglePage" xml:space="preserve">
+    <value>Single Page</value>
+  </data>
+  <data name="ViewRightMenuBlankSpacePageDisPlay_SinglePageContinuous" xml:space="preserve">
+    <value>Single Page Continuous</value>
+  </data>
+  <data name="ViewRightMenuBlankSpacePageDisPlay_TwoPage" xml:space="preserve">
+    <value>Two Pages</value>
+  </data>
+  <data name="ViewRightMenuBlankSpacePageDisPlay_TwoPageContinuous" xml:space="preserve">
+    <value>Two Pages Continuous</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceViewZoom_ActualSize" xml:space="preserve">
+    <value>Actual Size</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceViewZoom_FitPage" xml:space="preserve">
+    <value>Fit Page</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceViewZoom_FitWidth" xml:space="preserve">
+    <value>Fit Width</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceViewZoom_ZoomIn" xml:space="preserve">
+    <value>Zoom In</value>
+  </data>
+  <data name="ViewRightMenuBlankSpaceViewZoom_ZoomOut" xml:space="preserve">
+    <value>Zoom Out</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_AddBookmarks" xml:space="preserve">
+    <value>Add Bookmarks</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_AddComment" xml:space="preserve">
+    <value>Add Comment</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_ContentSelection" xml:space="preserve">
+    <value>Content Selection</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_DefaultTool" xml:space="preserve">
+    <value>Default Tool</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_Freehand" xml:space="preserve">
+    <value>Freehand</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_HideAnnotations" xml:space="preserve">
+    <value>Hide Annotations</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_HighlightLinks" xml:space="preserve">
+    <value>Highlight Links</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_PageDisPlay" xml:space="preserve">
+    <value>Page DisPlay</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_Paste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_Print" xml:space="preserve">
+    <value>Print</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_ReadModeOff" xml:space="preserve">
+    <value>Read Mode Off</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_ReadModeOn" xml:space="preserve">
+    <value>Read Mode On</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_RemoveBookmarks" xml:space="preserve">
+    <value>Remove Bookmarks</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_ScrollTool" xml:space="preserve">
+    <value>Scroll Tool</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_Search" xml:space="preserve">
+    <value>Search</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_ShowAnnotations" xml:space="preserve">
+    <value>Show Annotation</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_Tools" xml:space="preserve">
+    <value>Tools</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_Zoom" xml:space="preserve">
+    <value>Zoom</value>
+  </data>
+  <data name="ViewRightMenuBlankSpace_ZoomtoSelectedArea" xml:space="preserve">
+    <value>Zoom to Selected Area</value>
+  </data>
+  <data name="ViewRightMenuSelection_AddLink" xml:space="preserve">
+    <value>Add Link</value>
+  </data>
+  <data name="ViewRightMenuSelection_AddOutline" xml:space="preserve">
+    <value>Add Outline</value>
+  </data>
+  <data name="ViewRightMenuSelection_Copy" xml:space="preserve">
+    <value>Copy</value>
+  </data>
+  <data name="ViewRightMenuSelection_ExtractImage" xml:space="preserve">
+    <value>Extract Image</value>
+  </data>
+  <data name="ViewRightMenuSelection_Highlight" xml:space="preserve">
+    <value>Highlight</value>
+  </data>
+  <data name="ViewRightMenuSelection_Link" xml:space="preserve">
+    <value>Link</value>
+  </data>
+  <data name="ViewRightMenuSelection_Note" xml:space="preserve">
+    <value>Note</value>
+  </data>
+  <data name="ViewRightMenuSelection_Oval" xml:space="preserve">
+    <value>Oval</value>
+  </data>
+  <data name="ViewRightMenuSelection_Paste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="ViewRightMenuSelection_Rectangle" xml:space="preserve">
+    <value>Rectangle</value>
+  </data>
+  <data name="ViewRightMenuSelection_StraightLine" xml:space="preserve">
+    <value>Straight Line</value>
+  </data>
+  <data name="ViewRightMenuSelection_Strikethrough" xml:space="preserve">
+    <value>Strikethrough</value>
+  </data>
+  <data name="ViewRightMenuSelection_Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
+  <data name="ViewRightMenuSelection_Text1" xml:space="preserve">
+    <value>Text</value>
+  </data>
+  <data name="ViewRightMenuSelection_Underline" xml:space="preserve">
+    <value>Underline</value>
+  </data>
   <data name="ViewRightMenu_ActualSize" xml:space="preserve">
     <value>Actual Size</value>
   </data>

PDF Office/Styles/ContextMenuStyle.xaml

@@ -167,7 +167,7 @@
     <!--  阅读页点击空白处菜单  -->
     <ContextMenu x:Key="ViewerContextMenu" FontSize="14">
         <MenuItem
-            Header="{x:Static mainpage:MainPage.ViewRightMenu_Paste}"
+            Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_Paste}"
             InputGestureText="Ctrl+V"
             Tag="Paste" />
         <Separator
@@ -175,44 +175,44 @@
             BorderBrush="#33000000"
             BorderThickness="1"
             Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-        <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" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_AddComment}" Tag="AddAnnotation">
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_Freehand}" Tag="AnnotFreehand" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_Text}" Tag="AnnotFreeText" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_StickyNote}" Tag="AnnotSticky" />
             <Separator
                 Height="1"
                 BorderBrush="#33000000"
                 BorderThickness="1"
                 Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-            <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" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_Rectangle}" Tag="AnnotSquare" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_Oval}" Tag="AnnotCircle" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_Arrow}" Tag="AnnotArrow" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_StraightLine}" Tag="AnnotLine" />
             <Separator
                 Height="1"
                 BorderBrush="#33000000"
                 BorderThickness="1"
                 Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-            <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 Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_Link}" Tag="AnnotLink" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_Stamp}" Tag="AnnotStamp" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceAddComment_Signature}" Tag="AnnotAutograph" />
         </MenuItem>
-        <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" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_HideAnnotations}" Tag="HiddenAnnot" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_ShowAnnotations}" Tag="DisplayAnnot" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_AddBookmarks}" Tag="AddBookMark" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_RemoveBookmarks}" Tag="DelBookMark" />
         <Separator
             Height="1"
             BorderBrush="#33000000"
             BorderThickness="1"
             Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-        <MenuItem Header="工具模式" Tag="ToolMode">
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_Tools}" Tag="ToolMode">
             <MenuItem
-                Header="默认工具"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_DefaultTool}"
                 IsCheckable="True"
                 Tag="default" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_ScrollTool}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_ScrollTool}"
                 IsCheckable="True"
                 Tag="roll" />
             <MenuItem
@@ -221,68 +221,68 @@
                 Tag="magnifier"
                 Visibility="Collapsed" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_ContentSelection}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_ContentSelection}"
                 IsCheckable="True"
                 Tag="content" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_AreaZoom}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_ZoomtoSelectedArea}"
                 IsCheckable="True"
                 Tag="zoom"
                 Visibility="Collapsed" />
         </MenuItem>
-        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_OnReadMode}" Tag="ReadModel" />
-        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_OutReadMode}" Tag="UnReadModel" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_ReadModeOn}" Tag="ReadModel" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_ReadModeOff}" Tag="UnReadModel" />
         <Separator
             Height="1"
             BorderBrush="#33000000"
             BorderThickness="1"
             Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Zoom}" Tag="ViewZoom">
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_Zoom}" Tag="ViewZoom">
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_FitWidth}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceViewZoom_FitWidth}"
                 IsCheckable="True"
                 Tag="FitWidth" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_FitPage}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceViewZoom_FitPage}"
                 IsCheckable="True"
                 Tag="FitHeight" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_ActualSize}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceViewZoom_ActualSize}"
                 IsCheckable="True"
                 Tag="FitSize" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_ZoomIn}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceViewZoom_ZoomIn}"
                 IsCheckable="True"
                 Tag="enlarge" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_ZoomOut}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpaceViewZoom_ZoomOut}"
                 IsCheckable="True"
                 Tag="narrow" />
         </MenuItem>
-        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_PageDisplay}" Tag="PageDisplay">
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_PageDisPlay}" Tag="PageDisplay">
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_SinglePage}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpacePageDisPlay_SinglePage}"
                 IsCheckable="True"
                 Tag="SingleView" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_SinglePageContinuous}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpacePageDisPlay_SinglePageContinuous}"
                 IsCheckable="True"
                 Tag="SingleContinueView" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_TwoPages}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpacePageDisPlay_TwoPage}"
                 IsCheckable="True"
                 Tag="DoubleView" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_TwoPagesContinuous}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpacePageDisPlay_TwoPageContinuous}"
                 IsCheckable="True"
                 Tag="DoubleContinueView" />
             <MenuItem
-                Header="{x:Static mainpage:MainPage.ViewRightMenu_BookMode}"
+                Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpacePageDisPlay_BookMode}"
                 IsCheckable="True"
                 Tag="BookMode" />
         </MenuItem>
         <MenuItem
-            Header="高亮显示超链接"
+            Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_HighlightLinks}"
             IsCheckable="True"
             Tag="HighlightLinks" />
         <Separator
@@ -290,8 +290,8 @@
             BorderBrush="#33000000"
             BorderThickness="1"
             Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Search}" InputGestureText="Ctrl+F" Tag="Select" />
-        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Print}"  InputGestureText="Ctrl+P" Tag="Print" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_Search}" InputGestureText="Ctrl+F" Tag="Select" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenuBlankSpace_Print}"  InputGestureText="Ctrl+P" Tag="Print" />
         <ContextMenu.InputBindings>
             <KeyBinding
                 Key="P"

PDF Office/ViewModels/BOTA/AnnotationContentViewModel.cs

@@ -270,7 +270,7 @@ namespace PDF_Master.ViewModels.BOTA
         public void HiddenAnnot()
         {
             AnnotationListItems.Clear();
-            CurrentAnnotationLists = GetDocumentAnnotionList(out ObservableCollection<AnnotationHandlerEventArgs> HideAnnots);
+            CurrentAnnotationLists = GetDocumentAnnotionList(out HideAnnots);
             AnnotationListItems.AddRange(CurrentAnnotationLists);
             if (AnnotationListItems.Count <= 0)
             {
@@ -284,7 +284,7 @@ namespace PDF_Master.ViewModels.BOTA
         {
             AnnotationListItems.Clear();
             //AnnotationListItems = GetDocumentAnnotionList(out ObservableCollection<AnnotationHandlerEventArgs> HideAnnots);
-            CurrentAnnotationLists = GetDocumentAnnotionList(out ObservableCollection<AnnotationHandlerEventArgs> HideAnnots);
+            CurrentAnnotationLists = GetDocumentAnnotionList(out HideAnnots);
             AnnotationListItems.AddRange(CurrentAnnotationLists);
             RefreshAnnotationListItems();
         }
@@ -314,7 +314,7 @@ namespace PDF_Master.ViewModels.BOTA
                     }
                     PdfViewer.ReloadVisibleAnnots();
                     //提取出来的注释文件 时间为空  则显示未系统当前时间
-                    CurrentAnnotationLists = GetDocumentAnnotionList(out ObservableCollection<AnnotationHandlerEventArgs> HideAnnots);
+                    CurrentAnnotationLists = GetDocumentAnnotionList(out HideAnnots);
                     //BOTA，注释列表，添加在页面上的注释要默认按照页面上的位置排序，从上往下，从左往右排列
                     //CurrentAnnotationLists = new ObservableCollection<AnnotationHandlerEventArgs>(CurrentAnnotationLists.OrderBy(item => item.ClientRect.X).ThenBy(item => item.ClientRect.Y));
                     AnnotationListItems.Clear();
@@ -1172,6 +1172,8 @@ namespace PDF_Master.ViewModels.BOTA
             KeyEventsHelper.KeyDown -= ShortCut_KeyDown;
         }
 
+        private ObservableCollection<AnnotationHandlerEventArgs> HideAnnots;
+
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
             var pdfview = navigationContext.Parameters[ParameterNames.PDFViewer] as CPDFViewer;
@@ -1181,6 +1183,13 @@ namespace PDF_Master.ViewModels.BOTA
                 ViewContentViewModel = viewContentViewModel;
                 PdfViewer = pdfview;
             }
+            CurrentAnnotationLists = GetDocumentAnnotionList(out HideAnnots);
+
+            AnnotationListItems = new ObservableCollection<AnnotationHandlerEventArgs>();
+
+            AnnotationListItems.AddRange(CurrentAnnotationLists);
+
+            AnnotationListItems.CollectionChanged += AnnotationListItems_CollectionChanged;
             SetGroupHeader(listBox);
             //RefreshAnnotationListItems();
             KeyEventsHelper.KeyDown -= ShortCut_KeyDown;
@@ -1260,13 +1269,6 @@ namespace PDF_Master.ViewModels.BOTA
 
             #endregion BOTA，注释列表，添加在页面上的注释要默认按照页面上的位置排序，从上往下，从左往右排列
 
-            CurrentAnnotationLists = GetDocumentAnnotionList(out ObservableCollection<AnnotationHandlerEventArgs> HideAnnots);
-
-            AnnotationListItems = new ObservableCollection<AnnotationHandlerEventArgs>();
-
-            AnnotationListItems.AddRange(CurrentAnnotationLists);
-
-            AnnotationListItems.CollectionChanged += AnnotationListItems_CollectionChanged;
             //按照PageIndex，分组 排序
             ICollectionView iCollectionView = CollectionViewSource.GetDefaultView(AnnotationListItems);
             iCollectionView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(AnnotationHandlerEventArgs.PageIndex)));

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/CreateFromScannerDialogsViewModel.cs

@@ -84,7 +84,7 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs
      
 
         //没有检测到扫描仪
-        private int _SeIndex=0;
+        private int _SeIndex=-1;
         public int SeIndex
         {
             get { return _SeIndex; }
@@ -107,7 +107,12 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs
 
         public void ToScan()
         {
-            imageFile = Scan();
+           
+            if (SeIndex>-1)
+            {
+                imageFile = Scan();
+            }
+          
 
         }
 

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePagePictureToPDFDialogViewModel.cs

@@ -110,17 +110,50 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs
                 SetProperty(ref T_merge, value);
             }
         }
+        private string T_emptySelectFiles;
 
+        public string T_EmptySelectFiles
+        {
+            get { return T_emptySelectFiles; }
+            set
+            {
+                SetProperty(ref T_emptySelectFiles, value);
+            }
+        }
+        private string T_export;
+
+        public string T_Export
+        {
+            get { return T_export; }
+            set
+            {
+                SetProperty(ref T_export, value);
+            }
+        }
+
+        private string T_saveAsPDF;
+
+        public string T_SaveAsPDF
+        {
+            get { return T_saveAsPDF; }
+            set
+            {
+                SetProperty(ref T_saveAsPDF, value);
+            }
+        }
+        
         private void InitString()
         {
             T_Title = App.MainPageLoader.GetString("ImageToPDF_Title");
             T_AddFolder = App.MainPageLoader.GetString("ImageToPDF_AddFolder");
             T_AddFile = App.MainPageLoader.GetString("ImageToPDF_AddFile");
+            T_EmptySelectFiles = App.MainPageLoader.GetString("ImageToPDF_SelectFiles");
             T_EmptyContext = App.MainPageLoader.GetString("ImageToPDF_EmptyContext");
             T_Settings = App.MainPageLoader.GetString("ImageToPDF_Settings");
             T_ExportTitle = App.MainPageLoader.GetString("ImageToPDF_ExportTitle");
             T_Create = App.MainPageLoader.GetString("ImageToPDF_Create");
             T_Merge = App.MainPageLoader.GetString("ImageToPDF_Merge");
+            T_SaveAsPDF= App.MainPageLoader.GetString("ImageToPDF_SaveAsPDF");
         }
 
         #endregion

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePagePrinter/HomePagePrinterDialogViewModel.cs

@@ -1089,25 +1089,7 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                             PageRangeSelectIndex = 4;
                         }
                     }
-                    if (parameters.TryGetValue<int>(ParameterNames.PrintCurrentPage, out currentPage))
-                    {
-                        PrintSettingsInfo.PageRangeList = PageList;
-                        PrintSettingsInfo.PageRangeList[0]--;
-                        System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
-                        {
-                            PageRangeSelectIndex = 4;
-                        }));
-                    }
                 }
-                //else if (parameters.TryGetValue<int>(ParameterNames.PrintCurrentPage, out currentPage))
-                //{
-                //    PrintSettingsInfo.PageRangeList = PageList;
-                //    PrintSettingsInfo.PageRangeList[0]--;
-                //    System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
-                //    {
-                //        PageRangeSelectIndex = 1;
-                //    }));
-                //}
 
                 System.Windows.Size pageSize = PDFViewer.Document.GetPageSize(0);
 

PDF Office/ViewModels/Dialog/ToolsDialogs/SaftyDialogs/CheckPasswordDialogViewModel.cs

@@ -62,6 +62,13 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
             set { SetProperty(ref _errorPasswordMsg, value); }
         }
 
+        private string _passwordDialogTitle;
+        public string PasswordDialogTitle
+        {
+            get { return _passwordDialogTitle; }
+            set { SetProperty(ref _passwordDialogTitle, value); }
+        }
+
         private string _isRightValue = "unknown";
         public string IsRightValue
         {
@@ -97,7 +104,7 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
         public DelegateCommand ConfirmCommand { get; set; }
         public DelegateCommand CancelCommand { get; set; }
         public DelegateCommand ClearPasswordCommand { get; set; }
-        #endregion
+        #endregion  
 
         public CheckPasswordDialogViewModel()
         {
@@ -179,6 +186,14 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
             {
                 document = doc;
                 tempDocument = CPDFDocument.InitWithFilePath(document.FilePath);
+                if(passwordKind == EnumPasswordKind.StatusOpenPassword)
+                {
+                    PasswordDialogTitle = "Open Password";
+                }
+                else
+                {
+                    PasswordDialogTitle = "Permission Password";
+                }
                 InputPasswordMsg = "\"" + document.FileName + ".pdf\"" + " is protected, please enter a Document Open Password.";
                 CheckPasswordMsg = "Password";
                 ErrorPasswordMsg = "Tips Text";

PDF Office/ViewModels/PropertyPanel/AnnotPanel/SharpsAnnotPropertyViewModel.cs

@@ -1,18 +1,23 @@
 using ComPDFKit.PDFAnnotation;
 using ComPDFKitViewer;
 using ComPDFKitViewer.AnnotEvent;
+using ComPDFKitViewer.PdfViewer;
+using ImTools;
 using PDF_Master.CustomControl.CompositeControl;
 using PDF_Master.Helper;
 using PDF_Master.Model;
 using PDF_Master.Model.AnnotPanel;
+using PDF_Master.Properties;
 using PDF_Master.ViewModels.Tools;
 using PDF_Master.ViewModels.Tools.AnnotManager;
+using PDF_Master.Views.Tools;
 using PDFSettings;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -21,6 +26,8 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
+using Color = System.Windows.Media.Color;
+using Point = System.Windows.Point;
 
 namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
 {
@@ -158,8 +165,11 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
 
         public event EventHandler<object> LoadPropertyHandler;
 
-        public SharpsAnnotPropertyViewModel()
+        public IRegionManager region;
+
+        public SharpsAnnotPropertyViewModel(IRegionManager regionManager)
         {
+            region = regionManager;
             InitColorItems();
             InitFillColorItems();
             InitThicknessItems();
@@ -221,41 +231,20 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             {
                 var tag = (string)obj;
                 SharpsType(tag, true);
-                Dictionary<AnnotArgsType, object> changeData = new Dictionary<AnnotArgsType, object>();
-                switch (tag)
-                {
-                    case "Rect":
-                        changeData[AnnotArgsType.AnnotSquare] = tag;
-                        break;
-
-                    case "Circle":
-                        changeData[AnnotArgsType.AnnotCircle] = tag;
-                        break;
-
-                    case "Arrow":
-                        changeData[AnnotArgsType.AnnotLine] = tag;
-                        break;
-
-                    case "Line":
-                        changeData[AnnotArgsType.AnnotLine] = tag;
-                        break;
-                }
-                PropertyPanel.AnnotTypeChangedInvoke(this, changeData);
             }
         }
 
         private void SharpsType(string tag, bool isFromToolsBtn = false)
         {
+            Dictionary<AnnotArgsType, object> changeData = new Dictionary<AnnotArgsType, object>();
             switch (tag)
             {
                 case "Rect":
                     RectangleGeometry rectPath = new RectangleGeometry();
                     rectPath.Rect = new Rect(0, 5, 28, 22);
                     DataPath = rectPath;
-
+                    changeData[AnnotArgsType.AnnotSquare] = tag;
                     IsLineAnnot = false;
-                    //if (IsRect == false)
-                    //    IsRect = true;
                     break;
 
                 case "Circle":
@@ -264,10 +253,8 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                     circlePath.RadiusY = 14;
                     circlePath.Center = new Point(14, 14);
                     DataPath = circlePath;
-
+                    changeData[AnnotArgsType.AnnotCircle] = tag;
                     IsLineAnnot = false;
-                    //if (IsCircle == false)
-                    //    IsCircle = true;
                     break;
 
                 case "Arrow":
@@ -279,12 +266,9 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                         arrowLine.StartSharp = C_LINE_TYPE.LINETYPE_NONE;
                         arrowLine.EndSharp = C_LINE_TYPE.LINETYPE_ARROW;
                         DataPath = arrowLine.BuildArrowBody();
-
+                        changeData[AnnotArgsType.AnnotLine] = tag;
                         if (IsLineAnnot == false)
                             IsLineAnnot = true;
-                        //if (isArrow == false)
-                        //    isArrow = true;
-                        //  changeData[AnnotArgsType.AnnotLine] = tag;
                     }
 
                     break;
@@ -295,18 +279,16 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                         arrowLine.LineStart = new Point(0, 32);
                         arrowLine.LineEnd = new Point(32, 0);
                         DataPath = arrowLine.BuildArrowBody();
-
+                        changeData[AnnotArgsType.AnnotLine] = tag;
                         if (IsLineAnnot == false)
                             IsLineAnnot = true;
-                        //if (IsLine == false)
-                        //    IsLine = true;
                     }
 
                     break;
             }
 
-            //if (isFromToolsBtn)
-            //    PropertyPanel.AnnotTypeChangedInvoke(this, changeData);
+            if (isFromToolsBtn)
+                PropertyPanel.AnnotTypeChangedInvoke(this, changeData);
 
             StrShapeChecked = tag;
             PropertyPanel.SharpsAnnot = tag;
@@ -403,9 +385,34 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             if (obj is double)
             {
                 var tran = (double)obj;
+                AnnotArgsType argsType = AnnotArgsType.AnnotSquare;
+                bool isLine = false;
+                switch (BasicVm.strOtherTag)
+                {
+                    case "Rect":
+                        argsType = AnnotArgsType.AnnotSquare;
+                        break;
 
-                //BasicVm.AnnotThickness = tran;
-                PropertyPanel.UpdateAnnotAAttrib(AnnotAttrib.Thickness, tran);
+                    case "Circle":
+                        argsType = AnnotArgsType.AnnotCircle;
+                        break;
+
+                    case "Line":
+                        argsType = AnnotArgsType.AnnotLine;
+                        isLine = true;
+                        break;
+
+                    case "Arrow":
+                        argsType = AnnotArgsType.AnnotLine;
+                        isLine = false;
+                        break;
+                }
+                if (argsType == BasicVm.AnnotType)
+                {
+                    //if(argsType== AnnotArgsType.AnnotLine && isLine)
+                    BasicVm.AnnotThickness = tran;
+                    PropertyPanel.UpdateAnnotAAttrib(AnnotAttrib.Thickness, tran);
+                }
 
                 if (BasicVm.IsMultiSelected == false)
                     PropertyPanel.InvokeToMyTools(BasicVm.AnnotType, Annot);
@@ -457,10 +464,12 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
         public AnnotAttribEvent AnnotEvent { get; set; }
         public AnnotHandlerEventArgs Annot;
         public AnnotTransfer PropertyPanel;
+        public ViewContentViewModel ViewContentViewModel;
 
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
             navigationContext.Parameters.TryGetValue<AnnotTransfer>(ParameterNames.PropertyPanelContentViewModel, out PropertyPanel);
+            navigationContext.Parameters.TryGetValue<ViewContentViewModel>(ParameterNames.ViewContentViewModel, out ViewContentViewModel);
             if (PropertyPanel != null)
             {
                 AnnotEvent = PropertyPanel.AnnotEvent;
@@ -623,13 +632,10 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                             BasicVm.FillOpacity = Square.Transparency;
                             BasicVm.AnnotThickness = Square.LineWidth;
                             Dash = Square.LineDash;
-                            //SharpsType("Rect", false);
+                            SharpsType("Rect", false);
                             BasicVm.AnnotTypeTitle = "矩形";
                             IsLineAnnot = false;
                             IsRect = true;
-                            //IsCircle = false;
-                            //IsArrow=false;
-                            //IsLine= false;
                         }
                         break;
 
@@ -643,13 +649,10 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                             BasicVm.FillOpacity = Circle.Transparency;
                             BasicVm.AnnotThickness = Circle.LineWidth;
                             Dash = Circle.LineDash;
-                            //SharpsType("Circle", false);
+                            SharpsType("Circle", false);
                             BasicVm.AnnotTypeTitle = "圆";
                             IsLineAnnot = false;
                             IsCircle = true;
-                            //IsRect = false;
-                            //IsArrow = false;
-                            //IsLine = false;
                         }
                         break;
 
@@ -666,21 +669,15 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
 
                             if (line.TailLineType == C_LINE_TYPE.LINETYPE_ARROW && line.HeadLineType == C_LINE_TYPE.LINETYPE_NONE)
                             {
-                                //SharpsType("Arrow", false);
+                                SharpsType("Arrow", false);
                                 BasicVm.AnnotTypeTitle = "箭头";
                                 IsArrow = true;
-                                //IsCircle = false;
-                                //IsRect = false;
-                                //IsLine = false;
                             }
                             else
                             {
-                                //SharpsType("Line", false);
+                                SharpsType("Line", false);
                                 BasicVm.AnnotTypeTitle = "线条";
                                 IsLine = true;
-                                //IsCircle = false;
-                                //IsRect = false;
-                                //IsArrow = false;
                             }
 
                             IsLineAnnot = true;

PDF Office/ViewModels/Tools/AnnotManager/AnnotTransfer.cs

@@ -31,7 +31,7 @@ namespace PDF_Master.ViewModels.Tools.AnnotManager
         public AnnotHandlerEventArgs LastArrowAnnot = null;
 
         public string SharpsAnnot = "Rect";
-
+        public string AnnotSelect = "";
         //是否为填写与签名的日期文本
         public bool IsTextFill { get; private set; }
 

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -25,6 +25,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using System.Windows.Markup;
 using System.Windows.Media;
 
 namespace PDF_Master.ViewModels.Tools
@@ -362,25 +363,59 @@ namespace PDF_Master.ViewModels.Tools
         //选中和非选中注释
         private void PDFViewer_AnnotActiveHandler(object sender, AnnotAttribEvent e)
         {
+            if (e == null)
+            {
+                if (viewContentViewModel.CurrentBar != "TabItemAnnotation")
+                {
+                    //viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                    return;
+                }
+
+                if (!string.IsNullOrWhiteSpace(StrAnnotToolChecked))
+                {
+                    PropertyPanel.annot = null;
+                    PropertyPanel.AnnotEvents = null;
+                    PropertyPanel.AnnotEvent = null;
+                    PropertyPanel.annotlists = null;
+                    if (StrAnnotToolChecked != "Stamp" && StrAnnotToolChecked != "Freetext")
+                    {
+                        AnnotHandlerEventArgs annotArgs = null;
+                        //propertyPanel.SaveLastAnnot();
+                        FindAnnotTypeKey(StrAnnotToolChecked, ref annotArgs);
+
+                        return;
+                    }
+                }
+                else
+                {
+                    PropertyPanel.annot = null;
+                    PropertyPanel.AnnotEvents = null;
+                    PropertyPanel.AnnotEvent = null;
+                    PropertyPanel.annotlists = null;
+                    viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                    return;
+                }
+            }
+
             if (e != null)
-            {
-                if (e.IsMouseRightActive)
-                {
-                    ShowPropertyPanel(false);
-                    return;
-                }
+            {
+                if (e.IsMouseRightActive)
+                {
+                    ShowPropertyPanel(false);
+                    return;
+                }
                 CurrentSelectedAnnot = null;
                 var annot = e.AnnotItemsList[0];
                 if (annot != null)
-                {
+                {
                     if (e.AnnotItemsList.Count == 1)
-                    {
-                        //IsAnnotCreateReset：是否为创建注释的状态
+                    {
+                        //IsAnnotCreateReset：是否为创建注释的状态
                         if (e.IsAnnotCreateReset == false)
-                        {
+                        {
+                            CurrentSelectedAnnot = annot;
                             GetSelectedAnnots(e);
                             SelectedSignature(e.AnnotItemsList);
-                            CurrentSelectedAnnot = annot;
 
                             if (Settings.Default.AppProperties.InitialVIew.AutoExpandProperty
                                 && annot.EventType != AnnotArgsType.AnnotStamp && StrAnnotToolChecked != "Signature"
@@ -396,6 +431,9 @@ namespace PDF_Master.ViewModels.Tools
                             {
                                 StrAnnotToolChecked = "";
                             }
+
+                            //注释列表同步选中
+                            SelectedBotaAnnotationList(e);
                         }
                         else
                         {
@@ -502,84 +540,59 @@ namespace PDF_Master.ViewModels.Tools
                             GetSelectedAnnots(e);
                     }
                 }
-
-                //注释列表同步选中
-                var list = e.GetPageAnnotsIndex();
-                bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemAnnotation");
-
-                if (viewContentViewModel.OpenBOTA == true && isTabItemAnnotation == true && bOTAContent.TabItemAnnotation.IsSelected == true && list != null && list.Count > 0)
-                {
-                    if (list.Keys.Count == 0)
-                    {
-                        return;
-                    }
-                    var pageindex = new List<int>(list.Keys);
-                    List<int> annotes = new List<int>();
-                    list.TryGetValue(pageindex[0], out annotes);
-                    int annoteindex = annotes[0];
-                    AnnotationContentViewModel viewModel = GetAnnotationContentViewModel(bOTAContentViewModel, out AnnotationContent annotation);
-
-                    if (viewModel != null)
-                    {
-                        viewModel.ScrollToAnnot(pageindex[0], annoteindex, annotation.AnnotationList);
-                    }
-                }
             }
-            else
+            //else
+            //{
+            //if (StrAnnotToolChecked == "Link")
+            //{
+            //    if (PDFViewer.MouseMode != MouseModes.AnnotCreate)
+            //    {
+            //        if (PDFViewer.MouseMode == MouseModes.PanTool && propertyPanel.IsAddLink == false && propertyPanel.IsLocationLink == false)
+            //        {
+            //            viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+            //        }
+            //    }
+            //}
+            //if (string.IsNullOrWhiteSpace(StrAnnotToolChecked))
+            //{
+            //    viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+            //}
+            //}
+        }
+
+        /// <summary>
+        /// 注释列表同步选中
+        /// </summary>
+        /// <param name="e"></param>
+        private void SelectedBotaAnnotationList(AnnotAttribEvent e)
+        {
+            var list = e.GetPageAnnotsIndex();
+            bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemAnnotation");
+            //if (viewContentViewModel.OpenBOTA == false || isTabItemAnnotation == false || bOTAContent.TabItemAnnotation.IsSelected == false)
+            //{
+            //    viewContentViewModel.OpenBOTA = true;
+            //    bOTAContent.TabItemAnnotation.IsSelected = true;
+            //}
+            if (viewContentViewModel.OpenBOTA == true && isTabItemAnnotation == true && bOTAContent.TabItemAnnotation.IsSelected == true && list != null && list.Count > 0)
             {
-                if (viewContentViewModel.CurrentBar != "TabItemAnnotation")
+                if (list.Keys.Count == 0)
                 {
-                    //viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
                     return;
                 }
+                var pageindex = new List<int>(list.Keys);
+                List<int> annotes = new List<int>();
+                list.TryGetValue(pageindex[0], out annotes);
+                int annoteindex = annotes[0];
+                AnnotationContentViewModel viewModel = GetAnnotationContentViewModel(bOTAContentViewModel, out AnnotationContent annotation);
 
-                if (!string.IsNullOrWhiteSpace(StrAnnotToolChecked))
-                {
-                    PropertyPanel.annot = null;
-                    PropertyPanel.AnnotEvents = null;
-                    PropertyPanel.AnnotEvent = null;
-                    PropertyPanel.annotlists = null;
-                    if (StrAnnotToolChecked != "Stamp" && StrAnnotToolChecked != "Freetext")
-                    {
-                        AnnotHandlerEventArgs annotArgs = null;
-                        //propertyPanel.SaveLastAnnot();
-                        FindAnnotTypeKey(StrAnnotToolChecked, ref annotArgs);
-                        //if (annotArgs != null)
-                        //{
-                        //    //设置点击页面会创建对应选中注释工具的注释
-                        //    annotArgs.Author = Settings.Default.AppProperties.Description.Author;
-                        //    PDFViewer.SetMouseMode(MouseModes.AnnotCreate);
-                        //    PDFViewer.SetToolParam(annotArgs);
-                        //}
-                    }
-                }
-                else
+                if (viewModel != null)
                 {
-                    PropertyPanel.annot = null;
-                    PropertyPanel.AnnotEvents = null;
-                    PropertyPanel.AnnotEvent = null;
-                    PropertyPanel.annotlists = null;
-                    viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                    viewModel.ScrollToAnnot(pageindex[0], annoteindex, annotation.AnnotationList);
                 }
+            }
+        }
 
-                //if (StrAnnotToolChecked == "Link")
-                //{
-                //    if (PDFViewer.MouseMode != MouseModes.AnnotCreate)
-                //    {
-                //        if (PDFViewer.MouseMode == MouseModes.PanTool && propertyPanel.IsAddLink == false && propertyPanel.IsLocationLink == false)
-                //        {
-                //            viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
-                //        }
-                //    }
-                //}
-                //if (string.IsNullOrWhiteSpace(StrAnnotToolChecked))
-                //{
-                //    viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
-                //}
-            }
-        }
-
-        //在注释工具的状态下，右键菜单
+        //在注释工具的状态下，右键菜单
         private void PDFViewer_AnnotCommandHandler(object sender, AnnotCommandArgs e)
         {
             if (e.AnnotEventArgsList == null || (PDFViewer != null && PDFViewer.MouseMode == MouseModes.FormEditTool))
@@ -926,6 +939,8 @@ namespace PDF_Master.ViewModels.Tools
 
         private void PDFViewer_AnnotEditHandler(object sender, List<AnnotEditEvent> e)
         {
+            bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemAnnotation");
+
             if (e != null && e.Count > 0)
             {
                 MultipleSelectionAnnot(e);
@@ -937,7 +952,11 @@ namespace PDF_Master.ViewModels.Tools
                     switch (editEvent.EditAction)
                     {
                         case ActionType.Add:
-
+                            //if (viewContentViewModel.OpenBOTA == false || isTabItemAnnotation == false || bOTAContent.TabItemAnnotation.IsSelected == false)
+                            //{
+                            //    viewContentViewModel.OpenBOTA = true;
+                            //    bOTAContent.TabItemAnnotation.IsSelected = true;
+                            //}
                             //if (editEvent.EditAnnotArgs is StickyAnnotArgs stickyAnnotArgs)
                             //{
                             //    PDFViewer.SelectAnnotation(stickyAnnotArgs.PageIndex, stickyAnnotArgs.AnnotIndex);
@@ -947,9 +966,8 @@ namespace PDF_Master.ViewModels.Tools
                             //    PDFViewer.SelectAnnotation(freeTextAnnotArgs.PageIndex, freeTextAnnotArgs.AnnotIndex);
                             //}
                             //BOTA
-                            bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemAnnotation");
 
-                            if (viewContentViewModel.OpenBOTA == true && isTabItemAnnotation == true)
+                            if (viewContentViewModel.OpenBOTA == true && bOTAContent.TabItemAnnotation.IsSelected)
                             {
                                 AnnotationContentViewModel viewModel = GetAnnotationContentViewModel(bOTAContentViewModel, out AnnotationContent annotation);
 
@@ -975,8 +993,8 @@ namespace PDF_Master.ViewModels.Tools
                             break;
 
                         case ActionType.Del:
-                            isTabItemAnnotation = IsBOTATabItemShow(out bOTAContentViewModel, out bOTAContent, "TabItemAnnotation");
-                            if (isTabItemAnnotation)
+                            //isTabItemAnnotation = IsBOTATabItemShow(out bOTAContentViewModel, out bOTAContent, "TabItemAnnotation");
+                            if (bOTAContent.TabItemAnnotation.IsSelected)
                             {
                                 AnnotationContentViewModel viewModel = GetAnnotationContentViewModel(bOTAContentViewModel, out AnnotationContent annotation);
 
@@ -990,7 +1008,7 @@ namespace PDF_Master.ViewModels.Tools
                             break;
 
                         case ActionType.Modify:
-                            isTabItemAnnotation = IsBOTATabItemShow(out bOTAContentViewModel, out bOTAContent, "TabItemAnnotation");
+                            //isTabItemAnnotation = IsBOTATabItemShow(out bOTAContentViewModel, out bOTAContent, "TabItemAnnotation");
                             if (bOTAContent.TabItemAnnotation.IsSelected)
                             {
                                 AnnotationContentViewModel viewModel = GetAnnotationContentViewModel(bOTAContentViewModel, out AnnotationContent annotation);
@@ -1049,7 +1067,7 @@ namespace PDF_Master.ViewModels.Tools
                 }
             }
 
-            if (isAdd && selectAnnotDicts.Count > 1)
+            if (isAdd && selectAnnotDicts.Count >= 1)
             {
                 PDFViewer.ClearSelectAnnots();
 
@@ -1068,6 +1086,14 @@ namespace PDF_Master.ViewModels.Tools
         {
             if (e != null && e.DrawContext != null)
             {
+                if (StrAnnotToolChecked != "Link")
+                {
+                    if (e.Annot is CPDFLinkAnnotation linkAnnotation)
+                    {
+                        return;
+                    }
+                }
+
                 Rect hoverRect = new Rect(
                     e.PaintRect.Left - 2,
                     e.PaintRect.Top - 2,
@@ -1155,6 +1181,7 @@ namespace PDF_Master.ViewModels.Tools
             {
                 AnnotHandlerEventArgs annotArgs = null;
                 //PropertyPanel.SaveLastAnnot();
+                List<AnnotHandlerEventArgs> annots = new List<AnnotHandlerEventArgs>();
 
                 foreach (AnnotArgsType argsType in e.Keys)
                 {
@@ -1165,17 +1192,73 @@ namespace PDF_Master.ViewModels.Tools
                     switch (argsType)
                     {
                         case AnnotArgsType.AnnotSquare:
+                            if (CurrentSelectedAnnot != null)
+                            {
+                                if (CurrentSelectedAnnot.EventType == AnnotArgsType.AnnotSquare)
+                                    annots.Add(CurrentSelectedAnnot);
+                            }
+                            if (annots.Count > 0)
+                            {
+                                annotArgs = GetRect(annots);
+                            }
+                            else
+                            {
+                                annotArgs = GetRect();
+                            }
 
-                            annotArgs = GetRect();
                             break;
 
                         case AnnotArgsType.AnnotCircle:
-                            annotArgs = GetCircle();
+                            if (CurrentSelectedAnnot != null)
+                            {
+                                if (CurrentSelectedAnnot.EventType == AnnotArgsType.AnnotCircle)
+                                    annots.Add(CurrentSelectedAnnot);
+                            }
+                            if (annots.Count > 0)
+                            {
+                                annotArgs = GetCircle(annots);
+                            }
+                            else
+                            {
+                                annotArgs = GetCircle();
+                            }
+
                             break;
 
                         case AnnotArgsType.AnnotLine:
                             var LineTag = e[argsType] as string;
-                            annotArgs = GetArrowLine(LineTag);
+                            if (CurrentSelectedAnnot != null)
+                            {
+                                if (CurrentSelectedAnnot.EventType == AnnotArgsType.AnnotLine)
+                                {
+                                    if (CurrentSelectedAnnot is LineAnnotArgs lineAnnotArgs)
+                                    {
+                                        if (lineAnnotArgs.HeadLineType >= (C_LINE_TYPE)1 || lineAnnotArgs.TailLineType >= (C_LINE_TYPE)1)
+                                        {
+                                            if (LineTag == "Arrow")
+                                            {
+                                                annots.Add(CurrentSelectedAnnot);
+                                            }
+                                        }
+                                        else
+                                        {
+                                            if (LineTag == "Line")
+                                            {
+                                                annots.Add(CurrentSelectedAnnot);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            if (annots.Count > 0)
+                            {
+                                annotArgs = GetArrowLine(LineTag, annots);
+                            }
+                            else
+                            {
+                                annotArgs = GetArrowLine(LineTag);
+                            }
+
                             break;
                     }
                     ShowPropertyPanel();

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs

@@ -913,7 +913,7 @@ namespace PDF_Master.ViewModels.Tools
         /// </summary>
         /// <param name="selectedArgs"></param>
         /// <returns></returns>
-        private AnnotHandlerEventArgs GetRect(List<AnnotHandlerEventArgs> selectedArgs = null)
+        public AnnotHandlerEventArgs GetRect(List<AnnotHandlerEventArgs> selectedArgs = null)
         {
             SquareAnnotArgs squareArgs = null;
 
@@ -974,6 +974,7 @@ namespace PDF_Master.ViewModels.Tools
                     squareArgs.LineWidth = squareAnnot.LineWidth;
                     squareArgs.Transparency = squareAnnot.Transparency;
                     squareArgs.LineDash = squareAnnot.LineDash;
+                    squareArgs.ClientRect = Rect.Empty;
                 }
 
                 if (squareArgs != null)
@@ -997,7 +998,7 @@ namespace PDF_Master.ViewModels.Tools
         /// </summary>
         /// <param name="selectedArgs"></param>
         /// <returns></returns>
-        private AnnotHandlerEventArgs GetCircle(List<AnnotHandlerEventArgs> selectedArgs = null)
+        public AnnotHandlerEventArgs GetCircle(List<AnnotHandlerEventArgs> selectedArgs = null)
         {
             CircleAnnotArgs circleAnnotArgs = null;
 
@@ -1083,7 +1084,7 @@ namespace PDF_Master.ViewModels.Tools
         /// <param name="TagStr"></param>
         /// <param name="selectedArgs"></param>
         /// <returns></returns>
-        private AnnotHandlerEventArgs GetArrowLine(string TagStr, List<AnnotHandlerEventArgs> selectedArgs = null)
+        public AnnotHandlerEventArgs GetArrowLine(string TagStr, List<AnnotHandlerEventArgs> selectedArgs = null)
         {
             LineAnnotArgs lineArgs = new LineAnnotArgs();
 
@@ -1167,7 +1168,6 @@ namespace PDF_Master.ViewModels.Tools
                     lineArgs.LineWidth = lineAnnot.LineWidth;
                     lineArgs.Transparency = lineAnnot.Transparency;
                     lineArgs.LineDash = lineAnnot.LineDash;
-
                 }
 
                 if (lineArgs != null)

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Layout.cs

@@ -91,12 +91,35 @@ namespace PDF_Master.ViewModels.Tools
         private void ShowPropertyPanel(bool show = true)
         {
             viewContentViewModel.IsPropertyOpen = show;
-        }
-
+        }
+
         #endregion 属性面板
-
+
         #region 阅读页 - 右键菜单
 
+        #region 右击菜单文案
+
+        /// <summary>
+        /// 右键菜单文案
+        /// </summary>
+        /// 
+        public string T_RightMenuSelectionCopy = App.MainPageLoader.GetString("ViewRightMenuSelection_Copy");
+        public string T_RightMenuSelectionPaste = App.MainPageLoader.GetString("ViewRightMenuSelection_Paste");
+        public string T_RightMenuSelectionHighlight = App.MainPageLoader.GetString("ViewRightMenuSelection_Highlight");
+        public string T_RightMenuSelectionUnderline = App.MainPageLoader.GetString("ViewRightMenuSelection_Underline");
+        public string T_RightMenuSelectionStrikethrough = App.MainPageLoader.GetString("ViewRightMenuSelection_Strikethrough");
+        public string T_RightMenuSelectionText = App.MainPageLoader.GetString("ViewRightMenuSelection_Text");
+        public string T_RightMenuSelectionNote = App.MainPageLoader.GetString("ViewRightMenuSelection_Note");
+        public string T_RightMenuSelectionRectangle = App.MainPageLoader.GetString("ViewRightMenuSelection_Rectangle");
+        public string T_RightMenuSelectionOval = App.MainPageLoader.GetString("ViewRightMenuSelection_Oval");
+        public string T_RightMenuSelectionStraightLine = App.MainPageLoader.GetString("ViewRightMenuSelection_StraightLine");
+        public string T_RightMenuSelectionAddLink = App.MainPageLoader.GetString("ViewRightMenuSelection_AddLink");
+        public string T_RightMenuSelectionAddOutline = App.MainPageLoader.GetString("ViewRightMenuSelection_AddOutline");
+        public string T_RightMenuSelectionExtractImage = App.MainPageLoader.GetString("ViewRightMenuSelection_ExtractImage");
+        
+
+        #endregion
+
         private ContextMenu ViewerContextMenu(object sender)
         {
             ContextMenu contextMenu = App.Current.FindResource("ViewerContextMenu") as ContextMenu;
@@ -303,6 +326,7 @@ namespace PDF_Master.ViewModels.Tools
             menuItem = new MenuItem();
             menuItem.CommandTarget = (UIElement)sender;
             menuItem.Command = ApplicationCommands.Copy;
+            menuItem.Header = T_RightMenuSelectionCopy;
             if (annotCommand.CommandTarget == TargetType.ImageSelection && PDFViewer.GetSelectImageCount() > 0)
             {
                 menuItem.IsEnabled = true;
@@ -312,7 +336,8 @@ namespace PDF_Master.ViewModels.Tools
 
             menuItem = new MenuItem();
             menuItem.CommandTarget = (UIElement)sender;
-            menuItem.Command = ApplicationCommands.Paste;
+            menuItem.Command = ApplicationCommands.Paste;
+            menuItem.Header = T_RightMenuSelectionPaste;
             popMenu.Items.Add(menuItem);
 
             Separator separator = null;
@@ -321,7 +346,7 @@ namespace PDF_Master.ViewModels.Tools
                 separator = SetSeparator();
                 popMenu.Items.Add(separator);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_ExtractImage"), "ExportPicture", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionExtractImage, "ExportPicture", annotCommand, out menuItem);
                 if (PDFViewer.GetSelectImageCount() > 0)
                 {
                     menuItem.IsEnabled = true;
@@ -334,45 +359,45 @@ namespace PDF_Master.ViewModels.Tools
                 separator = SetSeparator();
                 popMenu.Items.Add(separator);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Highlight"), "HighLight", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionHighlight, "HighLight", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Underline"), "UnderLine", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionUnderline, "UnderLine", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Strikethrough"), "Strikeout", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionStrikethrough, "Strikeout", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
 
                 separator = SetSeparator();
                 //popMenu.Items.Add(separator);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Text"), "Freetext", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionText, "Freetext", annotCommand, out menuItem);
                 //popMenu.Items.Add(menuItem);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Note"), "StickyNote", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionNote, "StickyNote", annotCommand, out menuItem);
                 //popMenu.Items.Add(menuItem);
 
                 separator = SetSeparator();
                 popMenu.Items.Add(separator);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Rectangle"), "Rect", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionRectangle, "Rect", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Oval"), "Circle", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionOval, "Circle", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
 
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_StraightLine"), "Line", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionStraightLine, "Line", annotCommand, out menuItem);
                 //popMenu.Items.Add(menuItem);
             }
             separator = SetSeparator();
             popMenu.Items.Add(separator);
 
-            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_AddLink"), "Link", annotCommand, out menuItem);
+            SetSelectTextOrImageMenuItem(T_RightMenuSelectionAddLink, "Link", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
 
             if (annotCommand.CommandTarget == TargetType.Annot)
             {
-                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_AddOutline"), "OutLine", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(T_RightMenuSelectionAddOutline, "OutLine", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
             }
 
@@ -412,17 +437,32 @@ namespace PDF_Master.ViewModels.Tools
                 Style = (Style)App.Current.FindResource(System.Windows.Controls.ToolBar.SeparatorStyleKey)
             };
             return separator;
-        }
-
+        }
+
         #endregion 阅读页 - 右键菜单
-
+
         #region 注释-右键菜单
-
-        private ColorMenuItem colorContent;
-
+
+        #region 注释-右键菜单文案
+
+        public string T_RightMenuAnnotCopy = App.MainPageLoader.GetString("ViewRightMenuSelection_Copy");
+        public string T_RightMenuAnnotPaste = App.MainPageLoader.GetString("ViewRightMenuSelection_Paste");
+        public string T_RightMenuAnnotHighlight = App.MainPageLoader.GetString("ViewRightMenuSelection_Highlight");
+        public string T_RightMenuAnnotUnderline = App.MainPageLoader.GetString("ViewRightMenuSelection_Underline");
+        public string T_RightMenuAnnotStrikethrough = App.MainPageLoader.GetString("ViewRightMenuSelection_Strikethrough");
+        public string T_RightMenuAnnotText = App.MainPageLoader.GetString("ViewRightMenuSelection_Text");
+        public string T_RightMenuAnnotNote = App.MainPageLoader.GetString("ViewRightMenuSelection_Note");
+
+
+        #endregion
+
+        private ColorMenuItem colorContent;
+
         /// <summary>
         /// 高亮注释，右键菜单
-        /// </summary>
+        /// </summary>
+        /// 
+       
         private void InitSelectHightAnnotMenu()
         {
             var popMenu = new ContextMenu();

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -188,6 +188,7 @@ namespace PDF_Master.ViewModels.Tools
 
             if (annotBtn.IsChecked == true)
             {
+                PropertyPanel.AnnotSelect = StrAnnotToolChecked;
                 PropertyPanel.SaveLastAnnot();
                 MyToolCheckedDoing(dictVar, tag);
                 FindAnnotTypeKey(tag, ref annotArgs);
@@ -1579,9 +1580,13 @@ namespace PDF_Master.ViewModels.Tools
                 //BtnHandIsChecked = true;
 
                 PDFViewer.ClearSelectAnnots();
-                StrAnnotToolChecked = "";
-                ShowPropertyPanel(false);
+                //StrAnnotToolChecked = "";
+                //ShowPropertyPanel(false);
+                //PDFViewer.SetMouseMode(MouseModes.PanTool);
                 PDFViewer.SetMouseMode(MouseModes.PanTool);
+                HandToolIsCheckedEvent(false);
+                BtnHandIsChecked = false;
+                ShowPropertyPanel(false);
             }
             else if (KeyEventsHelper.IsModifierKey(ModifierKeys.Shift, Key.None))
             {

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -38,6 +38,8 @@ using PDF_Master.Views.BOTA;
 using System.Drawing;
 using PDF_Master.ViewModels.Tools.AnnotManager;
 using PDF_Master.Model.FillAndSign;
+using PDF_Master.Views.PropertyPanel.ViewModular;
+using PDF_Master.Views.PropertyPanel;
 using System.Windows.Threading;
 
 namespace PDF_Master.ViewModels
@@ -1958,6 +1960,7 @@ namespace PDF_Master.ViewModels
             parameters.Add(ParameterNames.PropertyPanelContentViewModel, annotPropertyPanel);
             parameters.Add(ParameterNames.ViewContentViewModel, this);
             region.RequestNavigate(PropertyRegionName, Content, parameters);
+           
         }
 
         /// <summary>
@@ -2088,7 +2091,7 @@ namespace PDF_Master.ViewModels
         {
             try
             {
-                if (string.IsNullOrEmpty(PDFViewer.Document.FilePath)||mainViewModel.NewFile)
+                if (string.IsNullOrEmpty(PDFViewer.Document.FilePath) || mainViewModel.NewFile)
                     return saveAsFile();
 
                 //文档已被修复时 提示另存为

PDF Office/Views/Dialog/ConverterDialogs/ConverterCSVDialog.xaml

@@ -22,14 +22,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1" >
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" VerticalAlignment="Top">
+                <Grid Grid.Column="0" VerticalAlignment="Top" Margin="0,0,0,0">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Margin="16,2,0,0">
+                    <StackPanel Margin="0,2,0,0">
                         <TextBlock
                                 Height="20"
                                 Style="{StaticResource PropertyHeaderLv2}"
@@ -63,7 +63,7 @@
                                 Text="{Binding T_PageRange}" />
                             <cus:WritableComboBox
                                 x:Name="PageRangeComboBox"
-                                Width="228"
+                                Width="208"
                                 Height="32"
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"

PDF Office/Views/Dialog/ConverterDialogs/ConverterExcelDialog.xaml

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" VerticalAlignment="Top"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical" Margin="16,2,0,0">
+                    <StackPanel Orientation="Vertical" Margin="0,2,0,0">
                         <StackPanel Orientation="Vertical">
                             <TextBlock Text="{Binding T_Settings}" Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
                             <StackPanel Orientation="Vertical" Margin="0,10,0,0">

PDF Office/Views/Dialog/ConverterDialogs/ConverterHTMLDialog.xaml

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
                         <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}">
@@ -43,7 +43,7 @@
                         </StackPanel>
                         <StackPanel Orientation="Vertical" Margin="0,0,0,0" >
                             <TextBlock Text="{Binding T_PageRange}" 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">
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" 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>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />

PDF Office/Views/Dialog/ConverterDialogs/ConverterImgDialog.xaml

@@ -22,14 +22,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212" />
+                    <ColumnDefinition Width="244" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Margin="16,2,0,0">
+                    <StackPanel Margin="0,2,0,0">
                         <StackPanel>
                             <TextBlock
                                 Style="{StaticResource PropertyHeaderLv2}"
@@ -38,7 +38,7 @@
                                 Text="{Binding T_Format}" />
                             <ComboBox
                                 Name="ImageTypeComboBox"
-                                Width="228"
+                                Width="208"
                                 Height="32"
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
@@ -47,7 +47,7 @@
                                 />
                             <!--<ComboBox
                                 Name="ImageDPIComboBox"
-                                Width="228"
+                                Width="208"
                                 Height="32"
                                 Margin="0,8,0,0"
                                 HorizontalAlignment="Left"
@@ -63,7 +63,7 @@
                                 Text="{Binding T_PageRange}" />
                             <cus:WritableComboBox
                                 x:Name="PageRangeComboBox"
-                                Width="228"
+                                Width="208"
                                 Height="32"
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"

PDF Office/Views/Dialog/ConverterDialogs/ConverterPPTDialog.xaml

@@ -20,20 +20,20 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
                         <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"/>
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="228" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
+                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="208" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
                                 <ComboBoxItem Content="Chinese Simplified"/>
                                 <ComboBoxItem Content="Chinese Traditional"/>
                                 <ComboBoxItem Content="English"/>
@@ -43,7 +43,7 @@
                         </StackPanel>
                         <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                             <TextBlock Text="{Binding T_PageRange}" 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">
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" 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>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />

PDF Office/Views/Dialog/ConverterDialogs/ConverterRTFDialog.xaml

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
                         <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">
@@ -43,7 +43,7 @@
                         </StackPanel>
                         <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                             <TextBlock Text="{Binding T_PageRange}" 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">
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" 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>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />

PDF Office/Views/Dialog/ConverterDialogs/ConverterTextDialog.xaml

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
                         <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" >
@@ -43,7 +43,7 @@
                         </StackPanel>
                         <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                             <TextBlock Text="{Binding T_PageRange}" 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">
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" 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>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />

PDF Office/Views/Dialog/ConverterDialogs/ConverterWordDialog.xaml

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview  x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"/>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical" Margin="16,2,0,0">
+                    <StackPanel Orientation="Vertical" Margin="0,2,0,0">
                         <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Visibility="Collapsed">
                             <TextBlock Text="Layout Settings"  Style="{StaticResource PropertyHeaderLv2}" Height="20" HorizontalAlignment="Left"/>
                             <StackPanel Orientation="Vertical" Margin="0,8,0,0">
@@ -47,7 +47,7 @@
                                 <CheckBox Name="OCRCheckBox"  Margin="0,8,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0">
                                     <TextBlock Text="Recognize text if needed"/>
                                 </CheckBox>
-                                <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="228" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
+                                <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="208" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
                                     <ComboBoxItem Content="Chinese Simplified"/>
                                     <ComboBoxItem Content="Chinese Traditional"/>
                                     <ComboBoxItem Content="English"/>
@@ -57,7 +57,7 @@
                             </StackPanel>
                             <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                                 <TextBlock Text="{Binding T_PageRange}" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
-                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,8,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">
+                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,8,0,0" Width="208" 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>
                                         <i:EventTrigger EventName="SelectionChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />

PDF Office/Views/Dialog/HomePageToolsDialogs/CreateFromScannerDialogs.xaml

@@ -1,48 +1,69 @@
-<UserControl x:Class="PDF_Master.Views.Dialog.HomePageToolsDialogs.CreateFromScannerDialogs"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:prism="http://prismlibrary.com/"
-             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             mc:Ignorable="d" 
-             Height="560" Width="352">
-    <Grid Background="White">
+<UserControl
+    x:Class="PDF_Master.Views.Dialog.HomePageToolsDialogs.CreateFromScannerDialogs"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:prism="http://prismlibrary.com/"
+    Width="352"
+    Height="560"
+    prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    Background="White"
+    mc:Ignorable="d">
+    <Grid Margin="16,0,16,0" Background="White">
+
         <Grid.RowDefinitions>
-            <RowDefinition Height="48"/>
-            <RowDefinition/>
-            <RowDefinition Height="64"/>
+            <RowDefinition Height="48" />
+            <RowDefinition />
+            <RowDefinition Height="64" />
         </Grid.RowDefinitions>
-        <TextBlock Text="从扫描仪创建pdf" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+        <TextBlock
+            Height="24"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            FontFamily="Segoe UI"
+            FontSize="16"
+            FontStyle="Normal"
+            FontWeight="SemiBold"
+            Text="Create PDF from scanner" />
         <Grid Grid.Row="1" Background="#F3F3F3">
             <StackPanel>
-                <TextBlock Text="扫描仪"/>
-                <ListBox Name="Listboxscan" Height="Auto"  SelectedIndex="{Binding SeIndex,Mode=TwoWay}">
-                
-                </ListBox>
+                <TextBlock
+                    Margin="8,0,0,0"
+                    FontFamily="Segoe UI"
+                    FontSize="14"
+                    LineHeight="22"
+                    Text="Scanners" />
+                <ListBox
+                    Name="Listboxscan"
+                    Height="Auto"
+                    Margin="10,0,0,0"
+                    SelectedIndex="{Binding SeIndex, Mode=TwoWay}" />
             </StackPanel>
         </Grid>
         <Grid Grid.Row="2">
             <WrapPanel HorizontalAlignment="Right" VerticalAlignment="Center">
-                <Button x:Name="But_Scan"                 
+                <Button
+                    x:Name="But_Scan"
                     Width="60"
-                    Height="32"                 
+                    Height="32"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
-                        Command="{Binding ToScanCommand}"
-                    Background="#273C62"                 
-                    Style="{StaticResource Btn.cta}" IsDefault="True" />
-                <Button/>
-                <Button                 
+                    Command="{Binding ToScanCommand}"
+                    Content="Scan"
+                    IsDefault="True"
+                    Style="{StaticResource Btn.cta}" />
+              
+                <Button
                     Width="60"
-                    Height="32"   
+                    Height="32"
                     Margin="8,0,0,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
-                    Background="#273C62"                 
-                    Style="{StaticResource Btn.cta}" IsCancel="True" />
-                <Button/>
+                    IsCancel="True"
+                    Style="{StaticResource btn.sec}" Content="Cancel" />
+               
             </WrapPanel>
         </Grid>
     </Grid>

PDF Office/Views/Dialog/HomePageToolsDialogs/CreateFromScannerDialogs.xaml.cs

@@ -30,11 +30,22 @@ namespace PDF_Master.Views.Dialog.HomePageToolsDialogs
         {
             InitializeComponent();
             ListScanners();
-          
-          
+
+            Loaded += Focus_Loaded;
+        }
+
+        public static ImageFile imageFile;
+
+        private void Focus_Loaded(object sender, RoutedEventArgs e)
+        {
+            //if (Listboxscan.Items.Count > 0)
+            //{
+            // Focus;
+            //}
+
+
         }
 
-        public static ImageFile imageFile ;
         private void ListScanners()
         {
            

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePagePictureToPDFDialog.xaml

@@ -255,7 +255,7 @@
                                 HorizontalAlignment="Center"
                                 FontSize="14"
                                 Style="{StaticResource PropertyHeaderLv2}"
-                                Text="No Files" />
+                                Text="{Binding T_EmptySelectFiles}" />
                                 <TextBlock
                                 Width="418"
                                 Height="20"
@@ -589,7 +589,7 @@
                         <TextBlock
                         FontSize="18"
                         Foreground="White"
-                        Text="导出文档" />
+                        Text="{Binding T_SaveAsPDF}" />
                     </Button>
                 </Grid>
             </Grid>

PDF Office/Views/Dialog/ServiceDialog/LoginPasswordRegion.xaml

@@ -74,6 +74,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -82,6 +83,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -188,6 +190,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -196,6 +199,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -245,6 +249,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -253,6 +258,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -446,7 +452,10 @@
             VerticalAlignment="Bottom"
             Background="#FDC7C6"
             Visibility="{Binding LoginPasswordlookVis}">
-            <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center" Margin="9,0,0,0">
+            <WrapPanel
+                Margin="9,0,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center">
                 <Border
                     Width="14"
                     Height="14"

PDF Office/Views/Dialog/ServiceDialog/LoginRegion.xaml

@@ -244,6 +244,7 @@
                                         Name="markText"
                                         Grid.Column="1"
                                         VerticalAlignment="Center"
+                                          Margin="8,0,0,0"
                                         FontSize="12"
                                         Foreground="#BBB"
                                         Text="{TemplateBinding help:PasswordBoxHelper.DisplayText}"
@@ -252,6 +253,7 @@
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
                                         VerticalAlignment="Center"
+                                          Margin="8,0,0,0"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
                                         VerticalScrollBarVisibility="Hidden" />

PDF Office/Views/Dialog/ServiceDialog/PasswordUpdataRegion.xaml

@@ -2,11 +2,10 @@
     x:Class="PDF_Master.Views.Dialog.ServiceDialog.PasswordUpdataRegion"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:convert="clr-namespace:PDF_Master.DataConvert"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="clr-namespace:PDF_Master.Helper"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-       xmlns:convert="clr-namespace:PDF_Master.DataConvert"
-
     xmlns:local="clr-namespace:PDF_Master.Views.Dialog.ServiceDialog"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
@@ -74,6 +73,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -82,6 +82,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -131,6 +132,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -139,6 +141,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -188,6 +191,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -196,6 +200,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -245,6 +250,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -253,6 +259,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -302,6 +309,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -310,6 +318,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -359,6 +368,7 @@
                                     <TextBlock
                                         Name="markText"
                                         Grid.Column="1"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         FontSize="12"
                                         Foreground="#BBB"
@@ -367,6 +377,7 @@
                                     <ScrollViewer
                                         x:Name="PART_ContentHost"
                                         MinHeight="20"
+                                        Margin="8,0,0,0"
                                         VerticalAlignment="Center"
                                         Focusable="false"
                                         HorizontalScrollBarVisibility="Hidden"
@@ -419,8 +430,8 @@
             VerticalAlignment="Top">
             <StackPanel>
                 <TextBlock
-                    Height="28"
                     Width="Auto"
+                    Height="28"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     FontFamily="Segoe UI"
@@ -428,34 +439,32 @@
                     FontStyle="Normal"
                     FontWeight="SemiBold"
                     Text="{Binding Text_passuodata}" />
-                <Grid  Margin="0,32,0,0">
+                <Grid Margin="0,32,0,0">
                     <Grid
-                    Width="262"
-                    Height="32"
-                   
-                    VerticalAlignment="Center">
+                        Width="262"
+                        Height="32"
+                        VerticalAlignment="Center">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
                             <ColumnDefinition Width="24" />
                         </Grid.ColumnDefinitions>
                         <PasswordBox
-                         x:Name="Text_RePassword2"
-                        Grid.ColumnSpan="2"
-                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
-                        help:PasswordBoxHelper.Password="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        InputMethod.IsInputMethodEnabled="False"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        Style="{StaticResource LoginPasswordBoxStyle2}"
-                        Visibility="{Binding LoginPasswordVisibility2, Mode=TwoWay}" />
+                            x:Name="Text_RePassword2"
+                            Grid.ColumnSpan="2"
+                            help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
+                            help:PasswordBoxHelper.Password="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            InputMethod.IsInputMethodEnabled="False"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Style="{StaticResource LoginPasswordBoxStyle2}"
+                            Visibility="{Binding LoginPasswordVisibility2, Mode=TwoWay}" />
                         <TextBox
-                       
-                        Grid.ColumnSpan="2"
-                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
-                        InputMethod.IsInputMethodEnabled="False"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        Style="{StaticResource LoginPasswordTextBoxStyle2}"
-                        Text="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        Visibility="{Binding LoginTextVisibility2, Mode=TwoWay}">
+                            Grid.ColumnSpan="2"
+                            help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg2, Mode=TwoWay}"
+                            InputMethod.IsInputMethodEnabled="False"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Style="{StaticResource LoginPasswordTextBoxStyle2}"
+                            Text="{Binding LoginPassword2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            Visibility="{Binding LoginTextVisibility2, Mode=TwoWay}">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="TextChanged">
                                     <i:InvokeCommandAction Command="{Binding LoginPasswordChanged2Command}" />
@@ -464,15 +473,15 @@
                         </TextBox>
 
                         <CheckBox
-                        x:Name="DisplayLoginPasswordChk2"
-                        Grid.Column="1"
-                        Height="16"
-                        HorizontalAlignment="Left"
-                        Panel.ZIndex="1"
-                        Command="{Binding DisplayPasswordCommand2}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                        Style="{StaticResource EyeCheckbox}"
-                        Visibility="{Binding ChkVis2}" />
+                            x:Name="DisplayLoginPasswordChk2"
+                            Grid.Column="1"
+                            Height="16"
+                            HorizontalAlignment="Left"
+                            Panel.ZIndex="1"
+                            Command="{Binding DisplayPasswordCommand2}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
+                            Style="{StaticResource EyeCheckbox}"
+                            Visibility="{Binding ChkVis2}" />
 
                     </Grid>
                     <Border
@@ -482,7 +491,7 @@
                         Effect="{StaticResource shadow.red-0-4}"
                         Visibility="{Binding ElementName=Textbl_pass1, Path=Text, Converter={StaticResource LoginBordVis}}" />
                 </Grid>
-               
+
 
                 <TextBlock
                     x:Name="Textbl_pass1"
@@ -492,31 +501,28 @@
                     Margin="0,2,0,0"
                     Foreground="#F3465B"
                     Text="{Binding LoginPasswordlook2, Mode=TwoWay}" />
-                <Grid  Margin="0,8,0,0">
-                    <Grid
-                    Width="262"
-                    Height="32"
-                   >
+                <Grid Margin="0,8,0,0">
+                    <Grid Width="262" Height="32">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
                             <ColumnDefinition Width="24" />
                         </Grid.ColumnDefinitions>
                         <PasswordBox
-                        Grid.ColumnSpan="2"
-                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
-                        help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        InputMethod.IsInputMethodEnabled="False"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        Style="{StaticResource LoginPasswordBoxStyle}"
-                        Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
+                            Grid.ColumnSpan="2"
+                            help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
+                            help:PasswordBoxHelper.Password="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            InputMethod.IsInputMethodEnabled="False"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Style="{StaticResource LoginPasswordBoxStyle}"
+                            Visibility="{Binding LoginPasswordVisibility, Mode=TwoWay}" />
                         <TextBox
-                        Grid.ColumnSpan="2"
-                        help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
-                        InputMethod.IsInputMethodEnabled="False"
-                        PreviewTextInput="TextBox_PreviewTextInput"
-                        Style="{StaticResource LoginPasswordTextBoxStyle}"
-                        Text="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        Visibility="{Binding LoginTextVisibility, Mode=TwoWay}">
+                            Grid.ColumnSpan="2"
+                            help:PasswordBoxHelper.DisplayText="{Binding LoginPasswordMsg, Mode=TwoWay}"
+                            InputMethod.IsInputMethodEnabled="False"
+                            PreviewTextInput="TextBox_PreviewTextInput"
+                            Style="{StaticResource LoginPasswordTextBoxStyle}"
+                            Text="{Binding LoginPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            Visibility="{Binding LoginTextVisibility, Mode=TwoWay}">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="TextChanged">
                                     <i:InvokeCommandAction Command="{Binding LoginPasswordChangedCommand}" />
@@ -524,15 +530,15 @@
                             </i:Interaction.Triggers>
                         </TextBox>
                         <CheckBox
-                        x:Name="DisplayLoginPasswordChk"
-                        Grid.Column="1"
-                        Height="16"
-                        HorizontalAlignment="Left"
-                        Panel.ZIndex="1"
-                        Command="{Binding DisplayPasswordCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                        Style="{StaticResource EyeCheckbox}"
-                        Visibility="{Binding ChkVis}" />
+                            x:Name="DisplayLoginPasswordChk"
+                            Grid.Column="1"
+                            Height="16"
+                            HorizontalAlignment="Left"
+                            Panel.ZIndex="1"
+                            Command="{Binding DisplayPasswordCommand}"
+                            CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
+                            Style="{StaticResource EyeCheckbox}"
+                            Visibility="{Binding ChkVis}" />
                     </Grid>
                     <Border
                         BorderBrush="#F3465B"
@@ -541,7 +547,7 @@
                         Effect="{StaticResource shadow.red-0-4}"
                         Visibility="{Binding ElementName=Textbl_pass2, Path=Text, Converter={StaticResource LoginBordVis}}" />
                 </Grid>
-               
+
 
 
                 <TextBlock
@@ -562,15 +568,18 @@
                     Style="{StaticResource Btn.cta}" />
             </StackPanel>
         </Grid>
-        
-        
+
+
         <Grid
             Width="326"
             Height="82"
             VerticalAlignment="Bottom"
             Background="#FDC7C6"
             Visibility="{Binding PasswordUpdatalookVis}">
-            <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center" Margin="9,0,0,0">
+            <WrapPanel
+                Margin="9,0,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center">
                 <Border
                     Width="14"
                     Height="14"

PDF Office/Views/Dialog/ToolsDialogs/SaftyDialogs/CheckPasswordDialog.xaml

@@ -90,7 +90,7 @@
             </Setter>
         </Style>
     </UserControl.Resources>
-    <cus:DialogContent FontFamily="Segoe UI" Header="Open Pasword">
+    <cus:DialogContent Header="{Binding PasswordDialogTitle}" FontFamily="Segoe UI">
         <cus:DialogContent.Content>
             <Grid
                 Width="400"

PDF Office/Views/PropertyPanel/AnnotPanel/FreetextAnnotProperty.xaml

@@ -376,7 +376,7 @@
                                 GroupName="TextAlign"
                                 IsChecked="{Binding FontVm.StrTextAlign, Mode=OneWay, Converter={StaticResource TextAlignToCheckedConverter}, ConverterParameter=Justify}"
                                 Style="{DynamicResource GreyBgRadioBtnStyle}"
-                                Tag="Justify">
+                                Tag="Justify" Visibility="Collapsed">
                                 <RadioButton.Content>
                                     <Grid Width="32" Height="32">
                                         <Canvas Margin="5,10,0,0">