转档-库替换（语言枚举全部改动），添加word流排

PDF Office/Model/Dialog/ConverterDialogs/ConverterDialogsModel.cs

@@ -14,7 +14,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
 {
     public class ConvertOptions
     {
-        public COCRLanguage OCRLanguage = COCRLanguage.English;
+        public COCRLanguage OCRLanguage = COCRLanguage.COCRLanguageEnglish;
         public bool IsAllowOCR = true;
         public bool IsContainOCRBgImage = true;
         public bool IsContainAnnotations = true;
@@ -25,6 +25,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
         public ImgType ImageType = ImgType.PNG;
         public uint ImageDpi = 150;
         public bool IsMergeCsv = false;
+        public LayoutOptions LayoutOpts= LayoutOptions.RetainPageLayout;
     }
 
     public class ConverterDialogsModel

PDF Office/Model/Dialog/ConverterDialogs/ConverterWordDialogModel.cs

@@ -18,6 +18,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
             wordOptions.IsContainOCRBgImage = Options.IsContainOCRBgImage;
             wordOptions.IsContainAnnotations = Options.IsContainAnnotations;
             wordOptions.IsContainImages = Options.IsContainImages;
+            wordOptions.LayoutOpts = Options.LayoutOpts;
             return wordOptions;
         }
     }

PDF Office/Model/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterDialogModel.cs

@@ -11,7 +11,7 @@ namespace PDF_Master.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
 {
     public class ConvertOptions
     {
-        public COCRLanguage OCRLanguage = COCRLanguage.English;
+        public COCRLanguage OCRLanguage = COCRLanguage.COCRLanguageEnglish;
         public bool IsAllowOCR = false;
         public bool IsContainOCRBgImage = false;
         public bool IsContainAnnotations = true;

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

@@ -603,19 +603,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             switch (SelectedIndex)
             {
                 case 0:
-                    ConverterExcelModel.Options.OCRLanguage= COCRLanguage.Chinese;
+                    ConverterExcelModel.Options.OCRLanguage= COCRLanguage.COCRLanguageChinese;
                     break;
                 case 1:
-                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.ChineseTraditional;
+                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChineseTraditional;
                     break;
                 case 2:
-                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.English;
+                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.COCRLanguageEnglish;
                     break;
                 case 3:
-                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.Japanese;
+                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.COCRLanguageJapanese;
                     break;
                 case 4:
-                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.Korean;
+                    ConverterExcelModel.Options.OCRLanguage = COCRLanguage.COCRLanguageKorean;
                     break;
                 default:
                     break;

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

@@ -388,19 +388,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             switch (SelectedIndex)
             {
                 case 0:
-                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.Chinese;
+                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChinese;
                     break;
                 case 1:
-                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.ChineseTraditional;
+                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChineseTraditional;
                     break;
                 case 2:
-                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.English;
+                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.COCRLanguageEnglish;
                     break;
                 case 3:
-                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.Japanese;
+                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.COCRLanguageJapanese;
                     break;
                 case 4:
-                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.Korean;
+                    ConverterHTMLModel.Options.OCRLanguage = COCRLanguage.COCRLanguageKorean;
                     break;
                 default:
                     break;

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

@@ -414,19 +414,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             switch (SelectedIndex)
             {
                 case 0:
-                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.Chinese;
+                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChinese;
                     break;
                 case 1:
-                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.ChineseTraditional;
+                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChineseTraditional;
                     break;
                 case 2:
-                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.English;
+                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.COCRLanguageEnglish;
                     break;
                 case 3:
-                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.Japanese;
+                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.COCRLanguageJapanese;
                     break;
                 case 4:
-                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.Korean;
+                    ConverterPPTModel.Options.OCRLanguage = COCRLanguage.COCRLanguageKorean;
                     break;
                 default:
                     break;

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

@@ -386,19 +386,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             switch (SelectedIndex)
             {
                 case 0:
-                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.Chinese;
+                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChinese;
                     break;
                 case 1:
-                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.ChineseTraditional;
+                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChineseTraditional;
                     break;
                 case 2:
-                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.English;
+                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.COCRLanguageEnglish;
                     break;
                 case 3:
-                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.Japanese;
+                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.COCRLanguageJapanese;
                     break;
                 case 4:
-                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.Korean;
+                    ConverterRTFModel.Options.OCRLanguage = COCRLanguage.COCRLanguageKorean;
                     break;
                 default:
                     break;

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

@@ -385,19 +385,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             switch (SelectedIndex)
             {
                 case 0:
-                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.Chinese;
+                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChinese;
                     break;
                 case 1:
-                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.ChineseTraditional;
+                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChineseTraditional;
                     break;
                 case 2:
-                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.English;
+                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.COCRLanguageEnglish;
                     break;
                 case 3:
-                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.Japanese;
+                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.COCRLanguageJapanese;
                     break;
                 case 4:
-                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.Korean;
+                    ConverterTextModel.Options.OCRLanguage = COCRLanguage.COCRLanguageKorean;
                     break;
                 default:
                     break;

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

@@ -1,4 +1,5 @@
 using ComDocumentAIKit;
+using ComPDFKit_Conversion.Options;
 using ComPDFKitViewer.PdfViewer;
 using PDF_Master.CustomControl;
 using PDF_Master.EventAggregators;
@@ -418,8 +419,10 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 switch (radioButton)
                 {
                     case "FlowingTextRadioBtn":
+                        ConverterWordModel.Options.LayoutOpts = LayoutOptions.RetainFlowingText;
                         break;
                     case "PageLayoutRadioBtn":
+                        ConverterWordModel.Options.LayoutOpts = LayoutOptions.RetainFlowingText;
                         break;
                     default:
                         break;
@@ -434,19 +437,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             switch (SelectedIndex)
             {
                 case 0:
-                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.Chinese;
+                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChinese;
                     break;
                 case 1:
-                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.ChineseTraditional;
+                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChineseTraditional;
                     break;
                 case 2:
-                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.English;
+                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.COCRLanguageEnglish;
                     break;
                 case 3:
-                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.Japanese;
+                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.COCRLanguageJapanese;
                     break;
                 case 4:
-                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.Korean;
+                    ConverterWordModel.Options.OCRLanguage = COCRLanguage.COCRLanguageKorean;
                     break;
                 default:
                     break;

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

@@ -260,19 +260,19 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             switch (SelectedIndex)
             {
                 case 0:
-                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.Chinese;
+                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChinese;
                     break;
                 case 1:
-                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.ChineseTraditional;
+                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.COCRLanguageChineseTraditional;
                     break;
                 case 2:
-                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.English;
+                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.COCRLanguageEnglish;
                     break;
                 case 3:
-                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.Japanese;
+                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.COCRLanguageJapanese;
                     break;
                 case 4:
-                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.Korean;
+                    ConverterDialogModel.Options.OCRLanguage = COCRLanguage.COCRLanguageKorean;
                     break;
                 default:
                     break;

PDF Office/ViewModels/Scan/ScanViwerViewModel.cs

@@ -75,7 +75,7 @@ namespace PDF_Master.ViewModels.Scan
             }
         }
 
-        private COCRLanguage language = COCRLanguage.English;
+        private COCRLanguage language = COCRLanguage.COCRLanguageEnglish;
 
         /// <summary>
         /// 增强扫描结果路径

PDF Office/ViewModels/Tools/ScanContentViewModel.cs

@@ -122,7 +122,7 @@ namespace PDF_Master.ViewModels.Tools
             CPDFDocument CurrentDoc = PDFViewer.Document;
             //CurrentDoc.FilePath;
 
-            CErrorCode error = imEngine.SetModel(COCRLanguage.Chinese);
+            CErrorCode error = imEngine.SetModel(COCRLanguage.COCRLanguageChinese);
             //CErrorCode error = imEngine.SetModel();
             for (int i = 0; i < 1; i++)
             {

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

@@ -28,14 +28,14 @@
                 </Grid>
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical" Margin="0,2,0,0">
-                        <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Visibility="Collapsed">
+                        <StackPanel Orientation="Vertical" Visibility="Visible">
                             <TextBlock Text="Layout Settings"  Style="{StaticResource PropertyHeaderLv2}" Height="20" HorizontalAlignment="Left"/>
                             <StackPanel Orientation="Vertical" Margin="0,8,0,0">
-                                <RadioButton Name="FlowingTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=FlowingTextRadioBtn,Path=Name}" IsEnabled="False"  Style="{StaticResource RadioButtonStyleText}" Visibility="Collapsed"
+                                <RadioButton Name="FlowingTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=FlowingTextRadioBtn,Path=Name}"   Style="{StaticResource RadioButtonStyleText}"
                                 Padding="8,0,0,0">
                                     <TextBlock Text="Retain Flowing Text"/>
                                 </RadioButton>
-                                <RadioButton  Margin="0,0,0,0" Name="PageLayoutRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=PageLayoutRadioBtn,Path=Name}" IsChecked="True"  Style="{StaticResource RadioButtonStyleText}"
+                                <RadioButton  Margin="0,8,0,0" Name="PageLayoutRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=PageLayoutRadioBtn,Path=Name}" IsChecked="True"  Style="{StaticResource RadioButtonStyleText}"
                                 Padding="8,0,0,0">
                                     <TextBlock Text="Retain Page Layout"/>
                                 </RadioButton>