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

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

@@ -1210,8 +1210,9 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                         else
                         {
                             PrintSettingsInfo.PageRangeList = PageList;
-                            CustomRangeString = PageListString;
                             PageRangeSelectIndex = 4;
+                            CustomRangeString = PageListString;
+                           
                         }
                     }
                 }

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePagePrinter/HomePagePrinterDialog.xaml.cs

@@ -33,8 +33,11 @@ namespace PDF_Master.Views.Dialog.HomePageToolsDialogs.HomePagePrinter
                     comboBoxItem.Content = App.MainPageLoader.GetString("WritableComboBox_CurrentPage");
                     PageRangeComboBox.writableComboBox.Items.Insert(1, comboBoxItem);
                 }
-                if (!string.IsNullOrEmpty( ((HomePagePrinterDialogViewModel)this.DataContext).PageListString))
-                    PageRangeComboBox.writableTextBox.Text = ((HomePagePrinterDialogViewModel)this.DataContext).PageListString;
+                if (!string.IsNullOrEmpty(((HomePagePrinterDialogViewModel)this.DataContext).PageListString))
+                {
+                    PageRangeComboBox.writableComboBox .SelectedIndex= ((HomePagePrinterDialogViewModel)this.DataContext).PageRangeSelectIndex ;
+                    PageRangeComboBox.writableTextBox.Text = ((HomePagePrinterDialogViewModel)this.DataContext).PageListString;
+                }
             }
         }