转档-UIBUG

PDF Office/App.xaml

@@ -521,6 +521,7 @@
                                     <Setter TargetName="arrow" Property="Fill" Value="{StaticResource color.icon.arrow.gray.dis}" />
                                     <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource color.field.bg.dis}" />
                                     <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource color.field.border.dis}" />
+                                    
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -605,6 +606,9 @@
                     <Trigger Property="HasItems" Value="false">
                         <Setter TargetName="dropDownBorder" Property="Height" Value="95" />
                     </Trigger>
+                    <Trigger Property="IsEnabled" Value="false">
+                        <Setter  Property="Foreground" Value="{StaticResource color.field.text.dis}"/>
+                    </Trigger>
                     <MultiTrigger>
                         <MultiTrigger.Conditions>
                             <Condition Property="IsGrouping" Value="true" />

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

@@ -14,7 +14,7 @@ namespace PDF_Office.Model.Dialog.ConverterDialogs
     public class ConvertOptions
     {
         public COCRLanguage OCRLanguage = COCRLanguage.English;
-        public bool IsAllowOCR = false;
+        public bool IsAllowOCR = true;
         public bool IsContainOCRBgImage =false;
         public bool IsContainAnnotations = true;
         public bool IsContainImages = true;

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

@@ -74,7 +74,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             }
         }
 
-        private bool oCRCheckBoxIsCheckBox = false;
+        private bool oCRCheckBoxIsCheckBox = true;
         public bool OCRCheckBoxIsCheckBox
         {
             get { return oCRCheckBoxIsCheckBox; }

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

@@ -48,7 +48,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             }
         }
 
-        private bool oCRCheckBoxIsCheckBox = false;
+        private bool oCRCheckBoxIsCheckBox = true;
         public bool OCRCheckBoxIsCheckBox
         {
             get { return oCRCheckBoxIsCheckBox; }

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

@@ -48,7 +48,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             }
         }
 
-        private bool oCRCheckBoxIsCheckBox = false;
+        private bool oCRCheckBoxIsCheckBox = true;
         public bool OCRCheckBoxIsCheckBox
         {
             get { return oCRCheckBoxIsCheckBox; }

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

@@ -48,7 +48,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             }
         }
 
-        private bool oCRCheckBoxIsCheckBox = false;
+        private bool oCRCheckBoxIsCheckBox = true;
         public bool OCRCheckBoxIsCheckBox
         {
             get { return oCRCheckBoxIsCheckBox; }

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

@@ -49,7 +49,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             }
         }
 
-        private bool oCRCheckBoxIsCheckBox = false;
+        private bool oCRCheckBoxIsCheckBox = true;
         public bool OCRCheckBoxIsCheckBox
         {
             get { return oCRCheckBoxIsCheckBox; }

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

@@ -48,7 +48,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
             }
         }
 
-        private bool oCRCheckBoxIsCheckBox = false;
+        private bool oCRCheckBoxIsCheckBox = true;
         public bool OCRCheckBoxIsCheckBox
         {
             get { return oCRCheckBoxIsCheckBox; }

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

@@ -33,18 +33,17 @@
                         <TextBlock
                                 Height="20"
                                 Style="{StaticResource PropertyHeaderLv2}"
-                            
                                 HorizontalAlignment="Left"
-                                Text="CSV Workbook Settings" />
+                                Text="CSV Settings" />
                         <StackPanel Margin="0,10,0,0">
                             <RadioButton
                                 IsChecked="True"
                                 Name="ForEachPageRadioBtn"
-                               
+                                Padding="8,0,0,0"
                                 Style="{StaticResource RadioButtonStyleText}"
                                 Command="{Binding RadioButtonCommand}"
                                 CommandParameter="{Binding ElementName=ForEachPageRadioBtn, Path=Name}">
-                                <TextBlock Text="Retain Flowing Text" />
+                                <TextBlock Text="Create worksheets for each &#13; form" />
                             </RadioButton>
                             <RadioButton
                                 
@@ -53,7 +52,7 @@
                                 Style="{StaticResource RadioButtonStyleText}"
                                 Command="{Binding RadioButtonCommand}"
                                 CommandParameter="{Binding ElementName=OnlyTableRadioBtn, Path=Name}">
-                                <TextBlock Text="Retain Page Layout" />
+                                <TextBlock Text="Create a single worksheet for &#13; a document" />
                             </RadioButton>
                         </StackPanel>
                         <StackPanel Margin="0,18,0,0" Orientation="Vertical">

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

@@ -29,11 +29,11 @@
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
+                            <TextBlock Text="HTML Recognition Settings" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
                             <CheckBox Name="OCRCheckBox"  Margin="0,8,0,0" Padding="8,0,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
                                 <TextBlock Text="Recognize text if needed"/>
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="228"  Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
+                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="228"  Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}" >
                                 <ComboBoxItem Content="Chinese Simplified"/>
                                 <ComboBoxItem Content="Chinese Traditional"/>
                                 <ComboBoxItem Content="English"/>

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

@@ -29,11 +29,11 @@
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
+                            <TextBlock Text="PPT Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
                             <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0">
                                 <TextBlock Text="Recognize text if needed"/>
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="228" Height="28.55" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
+                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="228" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
                                 <ComboBoxItem Content="Chinese Simplified"/>
                                 <ComboBoxItem Content="Chinese Traditional"/>
                                 <ComboBoxItem Content="English"/>

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

@@ -29,7 +29,7 @@
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
+                            <TextBlock Text="RTF Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
                             <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0">
                                 <TextBlock Text="Recognize text if needed"/>
                             </CheckBox>