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

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/Dialog/ToolsDialogs/SaftyDialogs/CheckPasswordDialogViewModel.cs

@@ -28,9 +28,10 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
             get { return _password; }
             set
             {
-                SetProperty(ref _password, value); 
+                SetProperty(ref _password, value);
                 IsRightValue = "unknow";
-                if (!string.IsNullOrEmpty(value)){
+                if (!string.IsNullOrEmpty(value))
+                {
                     ClearPasswordButtonVisibility = Visibility.Visible;
                 }
                 else
@@ -65,9 +66,10 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
         public string IsRightValue
         {
             get { return _isRightValue; }
-            set { 
+            set
+            {
                 SetProperty(ref _isRightValue, value);
-                if(value == "false")
+                if (value == "false")
                 {
                     ErrorPasswordMsgVisibility = Visibility.Visible;
                 }
@@ -123,8 +125,8 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
             }
             else
             {
-                if (tempDocument.CheckOwnerPassword(Password))
-                {  
+                if (tempDocument.UnlockWithPassword(Password) && tempDocument.CheckOwnerPassword(Password))
+                {
                         var dialogResult = new DialogResult(ButtonResult.OK);
                         dialogResult.Parameters.Add(ParameterNames.Password, Password);
                         dialogResult.Parameters.Add(ParameterNames.PasswordResult, true);
@@ -147,7 +149,7 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
 
         private void ClearPassword()
         {
-            Password= "";
+            Password = "";
         }
         #endregion
 

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

@@ -175,8 +175,8 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
 
             viewContentViewModel.SecurityInfo.NeedOpenPassword = false;
             viewContentViewModel.SecurityInfo.NeedPermissionsPassword = false;
-            viewContentViewModel.SecurityInfo.OpenPassword = null;
-            viewContentViewModel.SecurityInfo.PermissionsPassword = null;
+            viewContentViewModel.SecurityInfo.OpenPassword = string.Empty;
+            viewContentViewModel.SecurityInfo.PermissionsPassword = string.Empty;
             viewContentViewModel.SecurityInfo.CPDFPermissionsInfo = CreateDefaultPermissionsInfo();
             viewContentViewModel.SecurityInfo.IsPasswordRemoved = true;
             viewContentViewModel.SecurityInfo.IsPasswordChanged = false;

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();
                 }
             }