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

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -2068,8 +2068,8 @@ table</target>
           <target state="new">Reset All</target>
         </trans-unit>
         <trans-unit id="WritableComboBox_CustomRangeEge" translate="yes" xml:space="preserve">
-          <source>ege :  1,3-5, 10</source>
-          <target state="new">ege :  1,3-5, 10</target>
+          <source>ege :  1,3-5,10</source>
+          <target state="new">ege :  1,3-5,10</target>
         </trans-unit>
         <trans-unit id="ViewRightMenuAnnot_AddNote" translate="yes" xml:space="preserve">
           <source>Note</source>

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

@@ -2068,8 +2068,8 @@ table</target>
           <target state="new">Reset All</target>
         </trans-unit>
         <trans-unit id="WritableComboBox_CustomRangeEge" translate="yes" xml:space="preserve">
-          <source>ege :  1,3-5, 10</source>
-          <target state="new">ege :  1,3-5, 10</target>
+          <source>ege :  1,3-5,10</source>
+          <target state="new">ege :  1,3-5,10</target>
         </trans-unit>
         <trans-unit id="ViewRightMenuAnnot_AddNote" translate="yes" xml:space="preserve">
           <source>Note</source>

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

@@ -2068,8 +2068,8 @@ table</target>
           <target state="new">Reset All</target>
         </trans-unit>
         <trans-unit id="WritableComboBox_CustomRangeEge" translate="yes" xml:space="preserve">
-          <source>ege :  1,3-5, 10</source>
-          <target state="new">ege :  1,3-5, 10</target>
+          <source>ege :  1,3-5,10</source>
+          <target state="new">ege :  1,3-5,10</target>
         </trans-unit>
         <trans-unit id="ViewRightMenuAnnot_AddNote" translate="yes" xml:space="preserve">
           <source>Note</source>

PDF Office/ViewModels/BOTA/AnnotationContentViewModel.cs

@@ -1260,6 +1260,8 @@ namespace PDF_Master.ViewModels.BOTA
                     {
                         if (AnnotationListItems[k].PageIndex == pageIndex && AnnotationListItems[k].AnnotIndex == annotIndex && items[j].AnnotIndex == annotIndex)
                         {
+                            IsModified = false;
+
                             AnnotationHandlerEventArgs args = GetAddAnnotEventArgs(items[j]);
 
                             AnnotationListItems[k] = GetAddAnnotEventArgs(items[j]);

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

@@ -743,9 +743,14 @@ namespace PDF_Master.ViewModels.Tools
                         #region MVP 在对多选注释做处理
                         bool isDifferentAnnotTyle = AnnotTransfer.IsDifferentTypeAnnots(e.AnnotItemsList);
                         if (isDifferentAnnotTyle)
+                        {
                             viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                        }
                         else
+                        {
                             GetSelectedAnnots(e);
+                        }
+
                         #endregion MVP 在对多选注释做处理
 
                         if (viewContentViewModel.mainViewModel.IsBookMode)
@@ -1476,7 +1481,7 @@ namespace PDF_Master.ViewModels.Tools
             //        PDFViewer.SelectAnnotation(selectFreehandDicts);
             //    }
             //}
-            #endregion
+            #endregion 之前版本
         }
 
         //复制多个注释，粘贴后，默认注释未选中状态

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -1068,6 +1068,7 @@ namespace PDF_Master.ViewModels
                 {
                     PDFViewer.Document.CheckOwnerPassword(verifyResult.Password);
                 }
+                ShowLeftTip(false);
                 return true;
             }
             else
@@ -2644,7 +2645,8 @@ namespace PDF_Master.ViewModels
                     else
                         return false;
                 }
-
+                //记录保存前的当前页
+                int pageindex = PDFViewer.CurrentIndex;
                 //Security Fixed:
                 //修改密码后原文档保存的步骤：
                 //在设置密码窗口传出“已修改”信号，并允许延迟保存
@@ -2673,6 +2675,8 @@ namespace PDF_Master.ViewModels
                         string tempPath = PDFViewer.Document.FilePath + ".temp.pdf";
                         if (PDFViewer.Document.Descrypt(tempPath))
                         {
+                           
+                            
                             PDFViewer.CloseDocument();
                             PDFViewer.InitDocument(tempPath);
                             PDFViewer.Document.Encrypt(openPassword, permissionsPassword, cPDFPermissionsInfo);
@@ -2698,6 +2702,8 @@ namespace PDF_Master.ViewModels
                                 try
                                 {
                                     PDFViewer.Load();
+                                    //跳转到保存前的页面
+                                    PDFViewer.GoToPage(pageindex);
                                 }
                                 catch
                                 {
@@ -2739,6 +2745,8 @@ namespace PDF_Master.ViewModels
                         PDFViewer.CloseDocument();
                         PDFViewer.InitDocument(currentPath);
                         PDFViewer.Load();
+                        //跳转到保存前的页面
+                        PDFViewer.GoToPage(pageindex);
                         System.IO.File.Delete(tempPath);
                     }
                     catch

PDF Office/Views/BOTA/AnnotationContent.xaml.cs

@@ -408,11 +408,11 @@ namespace PDF_Master.Views.BOTA
 
         private void AnnotationList_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            var a = AnnotationList.SelectedItems.Count;
+            //var a = AnnotationList.SelectedItems.Count;
             var a1 = (sender as ListBox).SelectedItems.Count;
-            var a2 = (e.OriginalSource as ListBox).SelectedItems.Count;
-            var a3 = (e.Source as ListBox).SelectedItems.Count;
-            Trace.WriteLine("a:" + a + "   a1:" + a1 + "  a2:" + a2 + "  a3:" + a3);
+            //var a2 = (e.OriginalSource as ListBox).SelectedItems.Count;
+            //var a3 = (e.Source as ListBox).SelectedItems.Count;
+            //Trace.WriteLine("a:" + a + "   a1:" + a1 + "  a2:" + a2 + "  a3:" + a3);
             //AnnotationList.ScrollIntoView(AnnotationList.Items[0]);
             if (a1 == 1)
             {