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

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

@@ -1067,7 +1067,11 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                 if (parameters.TryGetValue<List<int>>(ParameterNames.PageList, out PageList))
                 {
                     PageListString = CommonHelper.GetPageParmFromList(PageList);
-
+                    PrintSettingsInfo.PageRangeList = PageList;
+                    for (int temp = 0; temp < PrintSettingsInfo.PageRangeList.Count; temp++)
+                    {
+                        PrintSettingsInfo.PageRangeList[temp]--;
+                    }
                     if (!string.IsNullOrEmpty(PageListString))
                     {
                         if (PageList.Count == 1)
@@ -1080,10 +1084,7 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                         else
                         {
                             PrintSettingsInfo.PageRangeList = PageList;
-                            for (int temp = 0; temp < PrintSettingsInfo.PageRangeList.Count; temp++)
-                            {
-                                PrintSettingsInfo.PageRangeList[temp]--;
-                            }
+
                             CustomRangeString = PageListString;
                             PageRangeSelectIndex = 4;
                         }
@@ -1091,14 +1092,14 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                 }
                 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);
 
                 if ((pageSize.Height / pageSize.Width > 1.0 && (double)PrintSettingsInfo.PrintDocument.DefaultPageSettings.PaperSize.Height / PrintSettingsInfo.PrintDocument.DefaultPageSettings.PaperSize.Width < 1.0)