打印、页面编辑 - 联动当前页、页面范围bug修复

PDF Office/Model/Dialog/ToolsDialogs/SaftyDialogs/CheckPasswordDialogModel.cs

@@ -23,9 +23,7 @@ namespace PDF_Master.Model.Dialog.ToolsDialogs.SaftyDialogs
             return GetHavePermissionsFromPermissionsSet;
         }
     }
-
-
-
+     
     public enum EnumPermissionsSet
     {
         None = 0,

PDF Office/Model/Dialog/ToolsDialogs/SaftyDialogs/SetPasswordDialogModel.cs

@@ -39,6 +39,7 @@ namespace PDF_Master.Model.Dialog.ToolsDialogs.SaftyDialogs
             permissionsInfo.AllowsFormFieldEntry = true;
             return permissionsInfo;
         }
+
         public static CPDFPermissionsInfo CreatePermissionsInfo(EnumPermissionsMod enumPermissionsMod)
         {
             CPDFPermissionsInfo permissionsInfo = CreateDefaultPermissionsInfo();

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

@@ -1071,18 +1071,16 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                             {
                                 PageRangeSelectIndex = 1;
                             }));
-
                         }
                         else
                         {
                             PrintSettingsInfo.PageRangeList = PageList;
-                            System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                            for (int temp = 0; temp < PrintSettingsInfo.PageRangeList.Count; temp++)
                             {
-                                CustomRangeString = PageListString;
-                                PageRangeSelectIndex = 4;
-
-                            }));
-
+                                PrintSettingsInfo.PageRangeList[temp]--;
+                            }
+                            CustomRangeString = PageListString;
+                            PageRangeSelectIndex = 4;
                         }
                     }
                 }

PDF Office/ViewModels/Tools/ToolsBarContentViewModel.cs

@@ -205,7 +205,7 @@ namespace PDF_Master.ViewModels.Tools
             VerifyPasswordResult result = SecurityHelper.VerifyPasswordByPasswordKind(PDFViewer.Document, EnumPasswordKind.StatusPermissionsPassword, dialogs);
             if (result.IsDiscryptied)
             { 
-                if (result.Password != null&&!string.IsNullOrEmpty(PDFViewer.Document.FilePath))
+                if (result.Password != null)
                 {
                     //string filePath = PDFViewer.Document.FilePath;
                     //PDFViewer.CloseDocument();

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -1162,7 +1162,7 @@ namespace PDF_Master.ViewModels
 
         public void CheckHaveAllPermission()
         {
-            if (SecurityHelper.CheckHaveAllPermissions(PDFViewer.Document))
+            if (!SecurityHelper.CheckHaveAllPermissions(PDFViewer.Document))
             {
                 ShowLeftTip(true);
                 NavigationParameters param = new NavigationParameters();
@@ -1658,7 +1658,7 @@ namespace PDF_Master.ViewModels
                 PDFViewer = pdfview;
                 if (loadFile())
                 {
-                    CheckHaveAllPermission();
+                     CheckHaveAllPermission();
                 }
             }