转档-文案修复，预览交互修复，excel提取表格ocr置灰，图片默认150dpi

PDF Office/App.xaml

@@ -315,7 +315,7 @@
                                         <Setter TargetName="indeterminateMark" Property="Opacity" Value="0" />
                                         <Setter TargetName="checkBoxBorder" Property="Background" Value="{StaticResource color.icon.checkbox-radio.dis.bg}" />
                                         <Setter TargetName="checkBoxBorder" Property="BorderBrush" Value="{StaticResource color.icon.checkbox-radio.dis.border}" />
-                                        <Setter TargetName="optionMark" Property="Fill" Value="{StaticResource color.icon.checkbox-radio.dis.fill}" />
+                                        <Setter TargetName="optionMark" Property="Stroke" Value="{StaticResource color.icon.checkbox-radio.dis.fill}" />
                                         <Setter Property="Foreground" Value="{StaticResource color.sys.text.neutral.dis}" />
                                     </MultiTrigger.Setters>
                                 </MultiTrigger>

PDF Office/CustomControl/PageTurningPreview.xaml.cs

@@ -43,6 +43,8 @@ namespace PDF_Master.CustomControl
                 this.CurrentPage.Text = (CurrentIndex + 1).ToString();
                 if (document != null)
                 {
+                    if (CurrentIndex == document.PageCount-1) { NextPage.IsEnabled = false; } else { NextPage.IsEnabled = true; }
+                    if (CurrentIndex == 0) { PrePage.IsEnabled = false; } else { PrePage.IsEnabled = true; }
                     AwaitRenderBitmap(document);
                 }
             }

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

@@ -172,7 +172,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             T_EachTableOnlyTables = App.MainPageLoader.GetString("Convert_PDFToExcelAllOnlyTablesEachTable");
             T_EachPageOnlyTables = App.MainPageLoader.GetString("Convert_PDFToExcelAllOnlyTablesEachPage");
             T_FileOnlyTables = App.MainPageLoader.GetString("Convert_PDFToExcelAllOnlyTablesFile");
-            T_OnlyText= App.MainPageLoader.GetString("Convert_PDFToExcelOnlyText");
+            T_OnlyText = App.MainPageLoader.GetString("Convert_PDFToExcelOnlyText");
             T_Settings = App.MainPageLoader.GetString("Convert_PDFToExcelSettings");
             T_PageRange = App.MainPageLoader.GetString("Convert_PDFPageRange");
 
@@ -242,6 +242,25 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             }
         }
 
+        private bool oCRIsEnable = true;
+        public bool OCRIsEnable
+        {
+            get { return oCRIsEnable; }
+            set
+            {
+                SetProperty(ref oCRIsEnable, value);
+                if (value == true)
+                {
+                    ConverterExcelModel.Options.IsAllowOCR = OCRCheckBoxIsCheckBox;
+                }
+                else
+                {
+                    ConverterExcelModel.Options.IsAllowOCR = false;
+                }
+
+            }
+        }
+
         private int languageSelectedIndex = 2;
         public int LanguageSelectedIndex
         {
@@ -434,7 +453,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             //{
 
             //});
-            
+
         }
 
         private void CmbPageSelectionChangedEvent(object e)
@@ -449,7 +468,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"] ||PageRangeSelectIndex == CheckPageSelect["4"])
+                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"] || PageRangeSelectIndex == CheckPageSelect["4"])
                 {
                     if (PageRangeSelectIndex == CheckPageSelect["4"]) { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, !IsCurrentPageIndex); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, !IsCurrentPageIndex); }
                     char[] enumerationSeparator = new char[] { ',' };
@@ -518,7 +537,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                     }
                     else
                     {
-                       // ConverterPreview.PageIndex.Text = (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;
                     }
@@ -538,18 +557,23 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, convertpdftoword, e => { });
         }
 
-        private void radiobutton(string e) {
-            string radioButton=e;
-            if (radioButton != null) {
+        private void radiobutton(string e)
+        {
+            string radioButton = e;
+            if (radioButton != null)
+            {
                 switch (radioButton)
                 {
                     case "AnyContentRadioBtn":
+                        OCRIsEnable = true;
                         AnyContent(AnyContentSelectIndex);
                         break;
                     case "OnlyTableRadioBtn":
                         OnlyTable(OnlyTableSelectIndex);
+                        OCRIsEnable = false;
                         break;
                     case "OnlyTextRadioBtn":
+                        OCRIsEnable = true;
                         ConverterExcelModel.Options.WorksheetOpts = WorksheetOptions.ForTheDocument;
                         ConverterExcelModel.Options.ContentOpts = ContentOptions.OnlyText;
                         break;
@@ -557,7 +581,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                         break;
                 }
             }
-        
+
         }
 
         private void AnyContent(int SelectedIndex)
@@ -599,11 +623,11 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
         private void SelectLanguage(int SelectedIndex)
         {
-            
+
             switch (SelectedIndex)
             {
                 case 0:
-                    ConverterExcelModel.Options.OCRLanguage= COCRLanguage.COCRLanguageChinese;
+                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChinese;
                     break;
                 case 1:
                     ConverterExcelModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChineseTraditional;

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

@@ -533,7 +533,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 if (currentViewer.Tag != null) { ConverterImgModel.Pawssword = currentViewer.Tag.ToString(); }
                 ConverterImgModel.InputPath = pdfViewer.Document.FilePath;
                 ImageTypeSelectedIndex = 0;
-                ImageDPISelectedIndex = 0;
+                ImageDPISelectedIndex =3 ;
                 FileInfo fileinfo = new FileInfo(ConverterImgModel.InputPath);
                 ConverterImgModel.OutputPath = fileinfo.DirectoryName;
 

PDF Office/Views/Dialog/ConverterDialogs/ConverterExcelDialog.xaml

@@ -55,7 +55,7 @@
                             </StackPanel>
                         </StackPanel>
                         <StackPanel Orientation="Vertical"  Margin="0,18,0,0">
-                            <StackPanel Orientation="Vertical" Visibility="Visible">
+                            <StackPanel Orientation="Vertical" Visibility="Visible" IsEnabled="{Binding OCRIsEnable}">
                                 <TextBlock Text="Text Recognition Settings:" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
                                 <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0" >
                                     <TextBlock Text="Recognize text if needed"/>
@@ -64,7 +64,7 @@
                                     <ComboBoxItem Content="Chinese Simplified"/>
                                     <ComboBoxItem Content="Chinese Traditional"/>
                                     <ComboBoxItem Content="English"/>
-                                    <ComboBoxItem Content="Japan"/>
+                                    <ComboBoxItem Content="Japanese"/>
                                     <ComboBoxItem Content="Korean"/>
                                 </ComboBox>
                             </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterHTMLDialog.xaml

@@ -37,7 +37,7 @@
                                 <ComboBoxItem Content="Chinese Simplified"/>
                                 <ComboBoxItem Content="Chinese Traditional"/>
                                 <ComboBoxItem Content="English"/>
-                                <ComboBoxItem Content="Japan"/>
+                                <ComboBoxItem Content="Japanese"/>
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterPPTDialog.xaml

@@ -37,7 +37,7 @@
                                 <ComboBoxItem Content="Chinese Simplified"/>
                                 <ComboBoxItem Content="Chinese Traditional"/>
                                 <ComboBoxItem Content="English"/>
-                                <ComboBoxItem Content="Japan"/>
+                                <ComboBoxItem Content="Japanese"/>
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterRTFDialog.xaml

@@ -37,7 +37,7 @@
                                 <ComboBoxItem Content="Chinese Simplified"/>
                                 <ComboBoxItem Content="Chinese Traditional"/>
                                 <ComboBoxItem Content="English"/>
-                                <ComboBoxItem Content="Japan"/>
+                                <ComboBoxItem Content="Japanese"/>
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterTextDialog.xaml

@@ -37,7 +37,7 @@
                                 <ComboBoxItem Content="Chinese Simplified"/>
                                 <ComboBoxItem Content="Chinese Traditional"/>
                                 <ComboBoxItem Content="English"/>
-                                <ComboBoxItem Content="Japan"/>
+                                <ComboBoxItem Content="Japanese"/>
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>

PDF Office/Views/Dialog/ConverterDialogs/ConverterWordDialog.xaml

@@ -51,7 +51,7 @@
                                     <ComboBoxItem Content="Chinese Simplified"/>
                                     <ComboBoxItem Content="Chinese Traditional"/>
                                     <ComboBoxItem Content="English"/>
-                                    <ComboBoxItem Content="Japan"/>
+                                    <ComboBoxItem Content="Japanese"/>
                                     <ComboBoxItem Content="Korean"/>
                                 </ComboBox>
                             </StackPanel>