Merge branch 'practice' into dev

# Conflicts:
#	PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterExcelDialogViewModel.cs

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterCSVDialogViewModel.cs

@@ -101,7 +101,8 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                 {
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
-                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (ConverterPreview.PageIndexLists[ConverterPreview.CurrentIndex] + 1).ToString(), currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex+1).ToString()
+, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
                         
                         Trace.WriteLine("输入不对");
@@ -110,7 +111,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                    this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }
@@ -225,6 +226,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             if (pdfViewer != null)
             {
                 currentViewer = pdfViewer;
+                if (currentViewer.Tag != null) { ConverterCSVModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterCSVModel.InputPath = pdfViewer.Document.FilePath;
                 FileInfo fileinfo = new FileInfo(ConverterCSVModel.InputPath);
                 ConverterCSVModel.OutputPath = fileinfo.DirectoryName;

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterExcelDialogViewModel.cs

@@ -61,7 +61,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             RadioButtonCommand = new DelegateCommand<string>(radiobutton);
             CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
             CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
-            BatchConverterCommand = new DelegateCommand(BatchConverter);
+            ConverterExcelModel.excelOption = ConverterExcelModel.ExcelOptions();
             dialogs = dialogService;
         }
         #region 逻辑函数
@@ -131,15 +131,17 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                 {
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
-                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (ConverterPreview.PageIndexLists[ConverterPreview.CurrentIndex] + 1).ToString(), currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex + 1).ToString()
+, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
+
                         Trace.WriteLine("输入不对");
                         MessageBoxEx.Show("输入不对");
                         return;
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }
@@ -229,6 +231,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             if (pdfViewer != null)
             {
                 currentViewer = pdfViewer;
+                if (currentViewer.Tag != null) { ConverterExcelModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterExcelModel.InputPath = pdfViewer.Document.FilePath;
                 FileInfo fileinfo = new FileInfo(ConverterExcelModel.InputPath);
                 ConverterExcelModel.OutputPath = fileinfo.DirectoryName;

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterHTMLDialogViewModel.cs

@@ -126,15 +126,17 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                 {
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
-                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (ConverterPreview.PageIndexLists[ConverterPreview.CurrentIndex] + 1).ToString(), currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex + 1).ToString()
+, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
+
                         Trace.WriteLine("输入不对");
                         MessageBoxEx.Show("输入不对");
                         return;
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }
@@ -199,6 +201,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             if (pdfViewer != null)
             {
                 currentViewer = pdfViewer;
+                if (currentViewer.Tag != null) { ConverterHTMLModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterHTMLModel.InputPath = pdfViewer.Document.FilePath;
                 FileInfo fileinfo = new FileInfo(ConverterHTMLModel.InputPath);
                 ConverterHTMLModel.OutputPath = fileinfo.DirectoryName;

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterImgDialogViewModel.cs

@@ -250,15 +250,17 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                 {
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
-                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (ConverterPreview.PageIndexLists[ConverterPreview.CurrentIndex] + 1).ToString(), currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex + 1).ToString()
+, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
+
                         Trace.WriteLine("输入不对");
                         MessageBoxEx.Show("输入不对");
                         return;
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }
@@ -323,6 +325,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             if (pdfViewer != null)
             {
                 currentViewer = pdfViewer;
+                if (currentViewer.Tag != null) { ConverterImgModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterImgModel.InputPath = pdfViewer.Document.FilePath;
                 FileInfo fileinfo = new FileInfo(ConverterImgModel.InputPath);
                 ConverterImgModel.OutputPath = fileinfo.DirectoryName;

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterPPTDialogViewModel.cs

@@ -123,15 +123,17 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                 {
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
-                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (ConverterPreview.PageIndexLists[ConverterPreview.CurrentIndex] + 1).ToString(), currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex + 1).ToString()
+, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
+
                         Trace.WriteLine("输入不对");
                         MessageBoxEx.Show("输入不对");
                         return;
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }
@@ -197,6 +199,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             if (pdfViewer != null)
             {
                 currentViewer = pdfViewer;
+                if (currentViewer.Tag != null) { ConverterPPTModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterPPTModel.InputPath = pdfViewer.Document.FilePath;
                 FileInfo fileinfo = new FileInfo(ConverterPPTModel.InputPath);
                 ConverterPPTModel.OutputPath = fileinfo.DirectoryName;

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterRTFDialogViewModel.cs

@@ -122,15 +122,17 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                 {
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
-                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (ConverterPreview.PageIndexLists[ConverterPreview.CurrentIndex] + 1).ToString(), currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex + 1).ToString()
+, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
+
                         Trace.WriteLine("输入不对");
                         MessageBoxEx.Show("输入不对");
                         return;
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }
@@ -195,6 +197,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             if (pdfViewer != null)
             {
                 currentViewer = pdfViewer;
+                if (currentViewer.Tag != null) { ConverterRTFModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterRTFModel.InputPath = pdfViewer.Document.FilePath;
                 FileInfo fileinfo = new FileInfo(ConverterRTFModel.InputPath);
                 ConverterRTFModel.OutputPath = fileinfo.DirectoryName;

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterTextDialogViewModel.cs

@@ -123,15 +123,17 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                 {
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
-                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (ConverterPreview.PageIndexLists[ConverterPreview.CurrentIndex] + 1).ToString(), currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex + 1).ToString()
+, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
+
                         Trace.WriteLine("输入不对");
                         MessageBoxEx.Show("输入不对");
                         return;
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }
@@ -196,6 +198,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             if (pdfViewer != null)
             {
                 currentViewer = pdfViewer;
+                if (currentViewer.Tag != null) { ConverterTextModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterTextModel.InputPath = pdfViewer.Document.FilePath;
                 FileInfo fileinfo = new FileInfo(ConverterTextModel.InputPath);
                 ConverterTextModel.OutputPath=fileinfo.DirectoryName;

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterWordDialogViewModel.cs

@@ -124,15 +124,17 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                 {
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
-                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (ConverterPreview.PageIndexLists[ConverterPreview.CurrentIndex] + 1).ToString(), currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                    if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex + 1).ToString()
+, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
+
                         Trace.WriteLine("输入不对");
                         MessageBoxEx.Show("输入不对");
                         return;
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }
@@ -215,6 +217,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             if (pdfViewer != null)
             {
                 currentViewer = pdfViewer;
+                if (currentViewer.Tag != null) { ConverterWordModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterWordModel.InputPath = pdfViewer.Document.FilePath;
                 FileInfo fileinfo = new FileInfo(ConverterWordModel.InputPath);
                 ConverterWordModel.OutputPath = fileinfo.DirectoryName;

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterDialogViewModel.cs

@@ -238,6 +238,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                     fileNamesIndex++;
                     continue;
                 }
+                string DocPassword = "";
                 if (document.IsLocked)
                 {
                     DialogParameters value = new DialogParameters();
@@ -248,7 +249,8 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         {
                             if (e.Parameters.ContainsKey(ParameterNames.PassWord) && e.Parameters.GetValue<string>(ParameterNames.PassWord) != null)
                             {
-                                document.UnlockWithPassword(e.Parameters.GetValue<string>(ParameterNames.PassWord).ToString());
+                                DocPassword = e.Parameters.GetValue<string>(ParameterNames.PassWord).ToString();
+                                document.UnlockWithPassword(DocPassword);
                             }
                         }
                     });
@@ -274,7 +276,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         if (ConverterWordModel != null)
                         {
                             PageNumber = ConverterWordModel.PageIndexLists.Count().ToString();
-                            result = await ConverterHelper.WordConvert(filename, OutputPath, GetProgress, PageIndexLists, ConverterWordModel.Pawssword);
+                            result = await ConverterHelper.WordConvert(filename, OutputPath, GetProgress, PageIndexLists, DocPassword);
                         }
                         break;
 
@@ -282,7 +284,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         if (ConverterExcelModel != null)
                         {
                             PageNumber = ConverterExcelModel.PageIndexLists.Count().ToString();
-                            result = await ConverterHelper.ExcelConvert(filename, OutputPath, GetProgress, PageIndexLists, ConverterExcelModel.Pawssword, ConverterExcelModel.excelOption);
+                            result = await ConverterHelper.ExcelConvert(filename, OutputPath, GetProgress, PageIndexLists, DocPassword, ConverterExcelModel.excelOption);
                         }
                         break;
                     case 2:
@@ -290,7 +292,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         if (ConverterPPTModel != null)
                         {
                             PageNumber = ConverterPPTModel.PageIndexLists.Count().ToString();
-                            result = await ConverterHelper.PPTConvert(filename, OutputPath, GetProgress, PageIndexLists, ConverterPPTModel.Pawssword);
+                            result = await ConverterHelper.PPTConvert(filename, OutputPath, GetProgress, PageIndexLists, DocPassword);
                         }
                         break;
                     case 3:
@@ -298,7 +300,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         if (ConverterRTFModel != null)
                         {
                             PageNumber = ConverterRTFModel.PageIndexLists.Count().ToString();
-                            result = await ConverterHelper.RTFConvert(filename, OutputPath, GetProgress, PageIndexLists, ConverterRTFModel.Pawssword);
+                            result = await ConverterHelper.RTFConvert(filename, OutputPath, GetProgress, PageIndexLists, DocPassword);
                         }
                         break;
                     case 4:
@@ -306,7 +308,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         if (ConverterHTMLModel != null)
                         {
                             PageNumber = ConverterHTMLModel.PageIndexLists.Count().ToString();
-                            result = await ConverterHelper.HTMLConvert(filename, OutputPath, GetProgress, PageIndexLists, ConverterHTMLModel.Pawssword, ConverterHTMLModel.HTMLOptions());
+                            result = await ConverterHelper.HTMLConvert(filename, OutputPath, GetProgress, PageIndexLists, DocPassword, ConverterHTMLModel.HTMLOptions());
                         }
                         break;
                     case 5:
@@ -314,14 +316,14 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         if (ConverterTextModel != null)
                         {
                             PageNumber = ConverterTextModel.PageIndexLists.Count().ToString();
-                            result = await ConverterHelper.TxtConvert(filename, OutputPath, GetProgress, PageIndexLists, ConverterTextModel.Pawssword);
+                            result = await ConverterHelper.TxtConvert(filename, OutputPath, GetProgress, PageIndexLists, DocPassword);
                         }
                         break;
                     case 6:
                         if (ConverterCSVModel != null)
                         {
                             PageNumber = ConverterCSVModel.PageIndexLists.Count().ToString();
-                            result = await ConverterHelper.CSVConvert(filename, OutputPath, GetProgress, ConverterCSVModel.PageIndexLists, ConverterCSVModel.Pawssword);
+                            result = await ConverterHelper.CSVConvert(filename, OutputPath, GetProgress, PageIndexLists, DocPassword);
                         }
                         break;
                     case 7:
@@ -329,7 +331,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                         if (ConverterImgModel != null)
                         {
                             PageNumber = ConverterImgModel.PageIndexLists.Count().ToString();
-                            result = await ConverterHelper.ImgConvert(filename, OutputPath, GetProgress, PageIndexLists, ConverterImgModel.Pawssword, ConverterImgModel.Type, ConverterImgModel.imageType);
+                            result = await ConverterHelper.ImgConvert(filename, OutputPath, GetProgress, PageIndexLists, DocPassword, ConverterImgModel.Type, ConverterImgModel.imageType);
                         }
                         break;
                     default:

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterExcelViewModel.cs

@@ -25,6 +25,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
         public HomePageConverterExcelViewModel()
         {
             RadioButtonCommand = new DelegateCommand<string>(radiobutton);
+            homePageConverterDialogViewModel.ConverterExcelModel.excelOption = ConverterExcelModel.ExcelOptions();
         }
         #region 逻辑函数
         private void radiobutton(string e)

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePagePictureToPDFDialogViewModel.cs

@@ -128,6 +128,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
         #endregion
         public HomePagePictureToPDFDialogViewModel(IDialogService dialogs)
         {
+            this.dialogs = dialogs;
             ToPDFCommand = new DelegateCommand(topdf);
             ADDPictureCommand = new DelegateCommand(addpicture);
             ADDPictureFilesCommand = new DelegateCommand(addpicturefiles);

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

@@ -599,7 +599,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
 
         public void SetCustomPageRange(object e)
         {
-            if ((PrintSettingsInfo.EnumPageRange == (int)EnumPageRangeWithoutCurrentPage.StatusCustomizedRange&&!isCurrentPage)||(PrintSettingsInfo.EnumPageRange == (int)EnumPageRangeWithoutCurrentPage.StatusCustomizedRange && isCurrentPage))
+            if ((PrintSettingsInfo.EnumPageRange == (int)EnumPageRangeWithoutCurrentPage.StatusCustomizedRange&&!isCurrentPage)||(PrintSettingsInfo.EnumPageRange == (int)EnumPageRangeWithCurrentPage.StatusCustomizedRange && isCurrentPage))
             {
                 var cmb = e as WritableComboBox;
                 if (cmb == null)