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

PDF Office/CustomControl/PageTurningPreview.xaml

@@ -8,7 +8,7 @@
              Height="320" Width="212">
     <Grid Width="212" Height="320">
         <StackPanel Orientation="Vertical" Height="320">
-            <Border  Margin="0,16,0,0" HorizontalAlignment="Center" VerticalAlignment="Top" Background="LightGray"  Height="248" Width="180">
+            <Border  Margin="0,16,0,0" HorizontalAlignment="Center" VerticalAlignment="Top" Background="#0000001A"  Height="248" Width="180">
                 <Viewbox>
                     <Image Name="Image" Height="248" Width="180"></Image>
                 </Viewbox>

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

@@ -345,7 +345,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
                 fileNames.AddRange(dlg.FileNames.ToList());
                 RemoveExcess(ref fileNames);
                 SetPictureToPDFGridIsEnabled = "True";
-                AddFileVisibility = Visibility.Collapsed;
+                AddFileVisibility = Visibility.Hidden;
                 RemoveIsEnable = "True";
                 updateListview("wait");
             }
@@ -356,7 +356,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
             fileNames.Add(filename);
             RemoveExcess(ref fileNames);
             SetPictureToPDFGridIsEnabled = "True";
-            AddFileVisibility = Visibility.Collapsed;
+            AddFileVisibility = Visibility.Hidden;
             RemoveIsEnable = "True";
             updateListview("wait");
         }
@@ -384,7 +384,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
                 RemoveExcess(ref fileNames);
                 updateListview("wait");
                 SetPictureToPDFGridIsEnabled = "True";
-                AddFileVisibility = Visibility.Collapsed;
+                AddFileVisibility = Visibility.Hidden;
                 RemoveIsEnable = "True";
             }
         }

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

@@ -25,44 +25,50 @@
                     <ColumnDefinition Width="212"/>
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0">
+                <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Margin="18,16,0,0">
+                    <StackPanel Margin="16,2,0,0">
                         <TextBlock
-                                Width="60"
                                 Height="20"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                            
                                 HorizontalAlignment="Left"
-                                Text="CSV设置:" />
-                        <StackPanel Margin="0,8,0,0">
+                                Text="CSV Workbook Settings" />
+                        <StackPanel Margin="0,10,0,0">
                             <RadioButton
                                 IsChecked="True"
                                 Name="ForEachPageRadioBtn"
+                               
+                                FontFamily="Segoe UI"
+                                Padding="9,0,0,0"
                                 Command="{Binding RadioButtonCommand}"
                                 CommandParameter="{Binding ElementName=ForEachPageRadioBtn, Path=Name}">
-                                <TextBlock Text="为每个表格创建工作表" />
+                                <TextBlock Text="Retain Flowing Text" />
                             </RadioButton>
                             <RadioButton
                                 
                                 Name="OnlyTableRadioBtn"
-                                Margin="0,6,0,0"
+                                Margin="0,8,0,0"
+                                Padding="9,0,0,0"
+                                FontFamily="Segoe UI"
                                 Command="{Binding RadioButtonCommand}"
                                 CommandParameter="{Binding ElementName=OnlyTableRadioBtn, Path=Name}">
-                                <TextBlock Text="为文档创建单个工作表" />
+                                <TextBlock Text="Retain Page Layout" />
                             </RadioButton>
                         </StackPanel>
-                        <StackPanel Margin="0,14,0,0" Orientation="Vertical">
+                        <StackPanel Margin="0,19,0,0" Orientation="Vertical">
                             <TextBlock
-                                Width="48"
                                 Height="20"
                                 HorizontalAlignment="Left"
-                                Text="页面范围" />
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="Page Range" />
                             <cus:WritableComboBox
                                 x:Name="PageRangeComboBox"
                                 Width="228"
                                 Height="32"
-                                Margin="0,4,0,0"
+                                Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
                                 IsCurrentPage="True"
                                 MaxPageRange="{Binding MaxPageRange}"
@@ -85,11 +91,11 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}"  Style="{StaticResource btn.sec}">
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}"  Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
-                </Button>
+                </Button>-->
                 <Button
                     Width="98"
                     Height="32"

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

@@ -8,8 +8,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pageeditdialogs="clr-namespace:PDF_Office.ViewModels.Dialog.PageEditDialogs"
              xmlns:prism="http://prismlibrary.com/"           
-             Width="529"
-             Height="482"
+             Width="586"
+             Height="498"
              d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
              d:DesignHeight="498"
              d:DesignWidth="586"
@@ -27,37 +27,40 @@
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" VerticalAlignment="Top"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical" Margin="18,16,0,0">
+                    <StackPanel Orientation="Vertical" Margin="16,2,0,0">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="Excel工作簿设置:" Height="20"/>
-                            <StackPanel Orientation="Vertical" Margin="0,7,0,0">
-                                <RadioButton Name="AnyContentRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=AnyContentRadioBtn,Path=Name}" IsChecked="True">
-                                    <TextBlock Text="所有内容"/>
+                            <TextBlock Text="ExcelExcel Workbook Settings" Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
+                            <StackPanel Orientation="Vertical" Margin="0,10,0,0">
+                                <RadioButton Name="AnyContentRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=AnyContentRadioBtn,Path=Name}" IsChecked="True" Padding="9,0,0,0"
+                                FontFamily="Segoe UI">
+                                    <TextBlock Text="All contents"/>
                                 </RadioButton>
-                                <ComboBox Margin="0,8,0,0" Width="228" Height="28.55" IsEnabled="{Binding ElementName=AnyContentRadioBtn,Path=IsChecked}"  SelectedIndex="{Binding AnyContentSelectIndex}">
+                                <ComboBox Margin="0,8,0,0" Width="326" Height="32" HorizontalAlignment="Left" IsEnabled="{Binding ElementName=AnyContentRadioBtn,Path=IsChecked}"  SelectedIndex="{Binding AnyContentSelectIndex}" >
                                     <ComboBoxItem Content="为每个页面创建工作表 "/>
                                     <ComboBoxItem Content="为文档创建单个工作表"/>
                                 </ComboBox>
-                                <RadioButton Margin="0,10,0,0" Name="OnlyTableRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=OnlyTableRadioBtn,Path=Name}">
-                                    <TextBlock Text="只提取表格"/>
+                                <RadioButton Margin="0,8,0,0" Name="OnlyTableRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=OnlyTableRadioBtn,Path=Name}" Padding="9,0,0,0"
+                                FontFamily="Segoe UI">
+                                    <TextBlock Text="Only Tables"/>
                                 </RadioButton>
-                                <ComboBox Name="OnlyTableComboBox" Margin="0,8,0,0" Width="228" Height="28.55" IsEnabled="{Binding ElementName=OnlyTableRadioBtn,Path=IsChecked}"  SelectedIndex="{Binding OnlyTableSelectIndex}">
+                                <ComboBox Name="OnlyTableComboBox"  Margin="0,8,0,0" Width="326" Height="32" HorizontalAlignment="Left" IsEnabled="{Binding ElementName=OnlyTableRadioBtn,Path=IsChecked}"  SelectedIndex="{Binding OnlyTableSelectIndex}">
                                     <ComboBoxItem Content="支持一个表格提取到单独的工作表"/>
                                     <ComboBoxItem Content="支持按页面提取表格到单独的工作表"/>
                                     <ComboBoxItem Content="支持将所有表格提取到一个工作表"/>
                                 </ComboBox>
-                                <RadioButton Margin="0,10,0,0" Name="OnlyTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=OnlyTextRadioBtn,Path=Name}">
-                                    <TextBlock Text="只提取文字"></TextBlock>
+                                <RadioButton Margin="0,8,0,0" Name="OnlyTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=OnlyTextRadioBtn,Path=Name}" Padding="9,0,0,0"
+                                FontFamily="Segoe UI">
+                                    <TextBlock Text="Only Text"></TextBlock>
                                 </RadioButton>
                             </StackPanel>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical"  Margin="0,16,0,0">
+                        <StackPanel Orientation="Vertical"  Margin="0,18,0,0">
                             <StackPanel Orientation="Vertical">
-                                <TextBlock Text="文本识别设置:" HorizontalAlignment="Left" Width="84" Height="20"/>
-                                <CheckBox Name="OCRCheckBox"  Margin="0,5,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
-                                    <TextBlock Text="在需要时识别文本"/>
+                                <TextBlock Text="Text Recognition Settings:" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
+                                <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="9,0,0,0">
+                                    <TextBlock Text="Recognize text if needed"/>
                                 </CheckBox>
-                                <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,6,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="326" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
                                     <ComboBoxItem Content="Chinese Simplified"/>
                                     <ComboBoxItem Content="Chinese Traditional"/>
                                     <ComboBoxItem Content="English"/>
@@ -65,9 +68,9 @@
                                     <ComboBoxItem Content="Korean"/>
                                 </ComboBox>
                             </StackPanel>
-                            <StackPanel Orientation="Vertical" Margin="0,14,0,0">
-                                <TextBlock Text="页面范围" Height="20" Width="48" HorizontalAlignment="Left"/>
-                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,4,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
+                            <StackPanel Orientation="Vertical" Margin="0,18,0,0">
+                                <TextBlock Text="Page Range" Height="20"  HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}"/>
+                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="326" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="SelectionChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -85,11 +88,11 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
-                </Button>
+                </Button>-->
                 <Button
                     Width="98"
                     Height="32"

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

@@ -23,17 +23,17 @@
                     <ColumnDefinition Width="212"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0">
+                <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="18,16,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="文本识别设置:" HorizontalAlignment="Left" Width="84" Height="20"/>
-                            <CheckBox Name="OCRCheckBox"  Margin="0,5,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
-                                <TextBlock Text="在需要时识别文本"/>
+                            <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
+                            <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" Padding="9,0,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
+                                <TextBlock Text="Recognize text if needed"/>
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,6,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"/>
@@ -41,9 +41,9 @@
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,14,0,0">
-                            <TextBlock Text="页面范围" Height="20" Width="48" HorizontalAlignment="Left"/>
-                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,4,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" Loaded="PageRangeComboBox_Loaded">
+                        <StackPanel Orientation="Vertical" Margin="0,18,0,0" >
+                            <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" Loaded="PageRangeComboBox_Loaded">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -60,11 +60,11 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
-                </Button>
+                </Button>-->
                 <Button
                     Width="98"
                     Height="32"

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

@@ -25,22 +25,22 @@
                     <ColumnDefinition Width="212" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0">
+                <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Margin="18,16,0,0">
+                    <StackPanel Margin="16,2,0,0">
                         <StackPanel>
                             <TextBlock
-                                Width="48"
+                                Style="{StaticResource PropertyHeaderLv2}"
                                 Height="20"
                                 HorizontalAlignment="Left"
-                                Text="文件类型" />
+                                Text="File Type" />
                             <ComboBox
                                 Name="ImageTypeComboBox"
                                 Width="228"
                                 Height="32"
-                                Margin="0,8,0,0"
+                                Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
                                 ItemsSource="{Binding ImageTypeFamily}"
                                 SelectedIndex="{Binding ImageTypeSelectedIndex, Mode=TwoWay}"
@@ -55,17 +55,17 @@
                                 SelectedIndex="{Binding ImageDPISelectedIndex, Mode=TwoWay}"
                                 />-->
                         </StackPanel>
-                        <StackPanel Margin="0,16,0,0">
+                        <StackPanel Margin="0,18,0,0">
                             <TextBlock
-                                Width="48"
+                                Style="{StaticResource PropertyHeaderLv2}"
                                 Height="20"
                                 HorizontalAlignment="Left"
-                                Text="页面范围" />
+                                Text="Page Range" />
                             <cus:WritableComboBox
                                 x:Name="PageRangeComboBox"
                                 Width="228"
                                 Height="32"
-                                Margin="0,4,0,0"
+                                Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
                                 IsCurrentPage="True"
                                 MaxPageRange="{Binding MaxPageRange}"

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

@@ -23,17 +23,17 @@
                     <ColumnDefinition Width="212"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0">
+                <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="18,16,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="文本识别设置:" HorizontalAlignment="Left" Width="84" Height="20"/>
-                            <CheckBox Name="OCRCheckBox"  Margin="0,5,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" >
-                                <TextBlock Text="在需要时识别文本"/>
+                            <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
+                            <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" >
+                                <TextBlock Text="Recognize text if needed"/>
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,6,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="28.55" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
                                 <ComboBoxItem Content="Chinese Simplified"/>
                                 <ComboBoxItem Content="Chinese Traditional"/>
                                 <ComboBoxItem Content="English"/>
@@ -41,9 +41,9 @@
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,14,0,0">
-                            <TextBlock Text="页面范围" Height="20" Width="48" HorizontalAlignment="Left"/>
-                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,4,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
+                        <StackPanel Orientation="Vertical" Margin="0,18,0,0">
+                            <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -60,11 +60,11 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
-                </Button>
+                </Button>-->
                 <Button
                     Width="98"
                     Height="32"

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

@@ -23,17 +23,17 @@
                     <ColumnDefinition Width="212"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" >
+                <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="18,16,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="文本识别设置:" HorizontalAlignment="Left" Width="84" Height="20"/>
-                            <CheckBox Name="OCRCheckBox"  Margin="0,5,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" >
-                                <TextBlock Text="在需要时识别文本"/>
+                            <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
+                            <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" >
+                                <TextBlock Text="Recognize text if needed"/>
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,6,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"/>
@@ -41,9 +41,9 @@
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,14,0,0">
-                            <TextBlock Text="页面范围" Height="20" Width="48" HorizontalAlignment="Left"/>
-                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,4,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
+                        <StackPanel Orientation="Vertical" Margin="0,18,0,0">
+                            <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -60,11 +60,11 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
-                </Button>
+                </Button>-->
                 <Button
                     Width="98"
                     Height="32"

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

@@ -23,17 +23,17 @@
                     <ColumnDefinition Width="212"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0">
+                <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="18,16,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="文本识别设置:" HorizontalAlignment="Left" Width="84" Height="20"/>
-                            <CheckBox Name="OCRCheckBox"  Margin="0,5,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
-                                <TextBlock Text="在需要时识别文本"/>
+                            <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
+                            <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
+                                <TextBlock Text="Recognize text if needed"/>
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}" Margin="0,6,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"/>
@@ -41,9 +41,9 @@
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,14,0,0">
-                            <TextBlock Text="页面范围" Height="20" Width="48" HorizontalAlignment="Left"/>
-                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,4,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
+                        <StackPanel Orientation="Vertical" Margin="0,18,0,0">
+                            <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -60,11 +60,11 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
-                </Button>
+                </Button>-->
                 <Button
                     Width="98"
                     Height="32"

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

@@ -23,29 +23,31 @@
                     <ColumnDefinition Width="212"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" >
+                <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview  x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"/>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical" Margin="18,0,0,0">
-                        <StackPanel Orientation="Vertical" Margin="0,16,0,0" HorizontalAlignment="Left">
-                            <TextBlock Text="版面设置:" Width="60" Height="20" HorizontalAlignment="Left"/>
-                            <StackPanel Orientation="Horizontal" Margin="0,7,0,0">
-                                <RadioButton Name="FlowingTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=FlowingTextRadioBtn,Path=Name}" IsEnabled="False">
-                                    <TextBlock Text="保留流排文本"/>
+                    <StackPanel Orientation="Vertical" Margin="16,2,0,0">
+                        <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
+                            <TextBlock Text="Layout Settings"  Style="{StaticResource PropertyHeaderLv2}" Height="20" HorizontalAlignment="Left"/>
+                            <StackPanel Orientation="Vertical" Margin="0,10,0,0">
+                                <RadioButton Name="FlowingTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=FlowingTextRadioBtn,Path=Name}" IsEnabled="False"  FontFamily="Segoe UI"
+                                Padding="9,0,0,0">
+                                    <TextBlock Text="Retain Flowing Text"/>
                                 </RadioButton>
-                                <RadioButton  Margin="15,0,0,0" Name="PageLayoutRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=PageLayoutRadioBtn,Path=Name}" IsChecked="True">
-                                    <TextBlock Text="保留页面布局"/>
+                                <RadioButton  Margin="0,8,0,0" Name="PageLayoutRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=PageLayoutRadioBtn,Path=Name}" IsChecked="True"  FontFamily="Segoe UI"
+                                Padding="9,0,0,0">
+                                    <TextBlock Text="Retain Page Layout"/>
                                 </RadioButton>
                             </StackPanel>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical"  Margin="0,17,0,0">
+                        <StackPanel Orientation="Vertical"  Margin="0,18,0,0">
                             <StackPanel Orientation="Vertical">
-                                <TextBlock Text="文本识别设置:" HorizontalAlignment="Left" Width="84" Height="20"/>
-                                <CheckBox Name="OCRCheckBox"  Margin="0,5,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
-                                    <TextBlock Text="在需要时识别文本"/>
+                                <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
+                                <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
+                                    <TextBlock Text="Recognize text if needed"/>
                                 </CheckBox>
-                                <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,6,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"/>
@@ -53,9 +55,9 @@
                                     <ComboBoxItem Content="Korean"/>
                                 </ComboBox>
                             </StackPanel>
-                            <StackPanel Orientation="Vertical" Margin="0,14,0,0">
-                                <TextBlock Text="页面范围" Height="20" Width="48" HorizontalAlignment="Left"/>
-                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,4,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" Loaded="PageRangeComboBox_Loaded">
+                            <StackPanel Orientation="Vertical" Margin="0,18,0,0">
+                                <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
+                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" Loaded="PageRangeComboBox_Loaded">
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="SelectionChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -73,11 +75,11 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
-                </Button>
+                </Button>-->
                 <Button
                     Width="98"
                     Height="32"

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePagePictureToPDFDialog.xaml

@@ -25,7 +25,7 @@
         </Grid.ColumnDefinitions>
         <Grid Grid.Column="0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="482"/>
+                <RowDefinition Height="*"/>
                 <RowDefinition Height="72"/>
             </Grid.RowDefinitions>
             <Grid  Grid.Row="0" AllowDrop="True"
@@ -35,7 +35,7 @@
                   DragLeave="MainPage_DragLeave"
                   >
                 <!--<Label Name="DropGrid" Background="#18A0FB" Opacity="0.5" Panel.ZIndex="1" Visibility="Collapsed"/>-->
-            <Button Name="BtnBlank"  Background="Green" Height="400" Width="400" Visibility="{Binding AddFileVisibility}" Command="{Binding ADDPictureCommand}">
+            <Button Name="BtnBlank"  Background="Green" Height="480" Width="632" Visibility="{Binding AddFileVisibility}" Command="{Binding ADDPictureCommand}">
             </Button>
             <ListView x:Name="listView" DataContext="{Binding ImagesDataTable}"  Background="White"  ItemsSource="{Binding}" SelectionChanged="listView_SelectionChanged" Visibility="{Binding ElementName=BtnBlank, Path=Visibility, Converter={StaticResource unVisibleConvert}}">
                 <ListView.ContextMenu>
@@ -83,15 +83,15 @@
             </Grid>
             <Grid Grid.Row="1">
                 <Button x:Name="MenuBtn"  Width="113"
-                    Height="40"
+                    Height="32"
                     Margin="25,0,0,0"
-                    HorizontalAlignment="Left" Click="Menu_Click">
+                    HorizontalAlignment="Left" Click="Menu_Click" Style="{StaticResource btn.sec}">
                     <StackPanel Orientation="Horizontal" >
                         <Border HorizontalAlignment="Right">
-                            <TextBlock Text="添加文件" FontSize="18" Foreground="Black"></TextBlock>
+                            <TextBlock Text="Add Files" FontSize="14" Foreground="Black" Width="57" Height="22" ></TextBlock>
                         </Border>
-                        <Border  Margin="12,0,0,0">
-                            <Path  VerticalAlignment="Center" HorizontalAlignment="Right" Stroke="Black"  Data="M0 0L8 4 L16 0" Height="10" Stretch="Fill" />
+                        <Border  Margin="12,0,0,0" Width="12" Height="7">
+                            <Path  VerticalAlignment="Center" HorizontalAlignment="Right" Fill="#94989C"  Data="M6 4.80726L1.26513 0L0 1.28448L5.36743 6.73398C5.71679 7.08868 6.28321 7.08868 6.63257 6.73398L12 1.28448L10.7349 0L6 4.80726Z"  Stretch="Fill" />
                         </Border>
                     </StackPanel>
                 </Button>
@@ -117,33 +117,37 @@
 
                 </Button>-->
                 <Button
-                    Width="40"
-                    Height="40"
+                    
+                    Width="32"
+                    Height="32"
                     Margin="25,0"
                     HorizontalAlignment="Right"
                     IsEnabled="{Binding RemoveIsEnable}"
-                    Command="{Binding RemovePictureFileCommand}">
-
+                    Command="{Binding RemovePictureFileCommand}"  Style="{StaticResource btn.sec}">
+                    <Grid  Width="16" Height="16">
+                        <Path   Fill="#616469"  Data="M6 1.75H10V0.25H6V1.75ZM1 4.25H2.25V15C2.25 15.4142 2.58579 15.75 3 15.75H13C13.4142 15.75 13.75 15.4142 13.75 15V4.25H15V2.75H1V4.25ZM3.75 14.25V4.25H12.25V14.25H3.75ZM7.25 6.5V11.5H8.75V6.5H7.25Z" />
+                    </Grid>
                 </Button>
             </Grid>
         </Grid>
         <Grid Grid.Column="1" Background="WhiteSmoke" IsEnabled="{Binding SetPictureToPDFGridIsEnabled}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="1*"/>
-                <RowDefinition Height="2*"/>
-                <RowDefinition Height="72"/>
+                <RowDefinition Height="64"/>
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0" Margin="15,23,0,0">
-                <StackPanel >
-                    <TextBlock Text="导出"/>
+            <Grid Grid.Row="0" Margin="16,14,0,0">
+                <StackPanel>
+                    <TextBlock Text="Setting" Style="{StaticResource PagesView_titleContext}"/>
+                    <TextBlock Text="Export" Height="20"  Style="{StaticResource PropertyHeaderLv2}" Margin="0,16,0,0"/>
+
                     <StackPanel Margin="0,8,0,0">
-                        <RadioButton Name="NewFilesRadioButtom" Click="RadioButton_Click" IsChecked="True">
+                        <RadioButton Name="NewFilesRadioButtom" Click="RadioButton_Click" IsChecked="True" Padding="9,0,0,0">
                             <TextBlock Text="新建文档"/>
                         </RadioButton>
-                        <RadioButton Name="OneNewFileNameRadioButtom" Margin="0,8,0,0" Click="RadioButton_Click">
+                        <RadioButton Name="OneNewFileNameRadioButtom" Margin="0,8,0,0" Click="RadioButton_Click" Padding="9,0,0,0">
                             <TextBlock Text="合并为同一份PDF文档"/>
                         </RadioButton>
-                        <RadioButton Name="SelectFileNameRadioButton" Margin="0,8,0,0" Click="RadioButton_Click">
+                        <RadioButton Name="SelectFileNameRadioButton" Margin="0,8,0,0" Click="RadioButton_Click" Padding="9,0,0,0">
                             <TextBlock Text="插入现有PDF文档"/>
                         </RadioButton>
                     </StackPanel>
@@ -167,8 +171,8 @@
                     </CheckBox>
                 </StackPanel>
             </Grid>
-            <Grid Grid.Row="2">
-                <Button Height="40" Width="228" Background="Black" Command="{Binding ToPDFCommand}" IsEnabled="{Binding ImageToPDFBtnIsEnable}">
+            <Grid Grid.Row="1">
+                <Button Height="32" Width="228"  Command="{Binding ToPDFCommand}" IsEnabled="{Binding ImageToPDFBtnIsEnable}" Style="{StaticResource Btn.cta}">
                     <TextBlock Text="导出文档" FontSize="18" Foreground="White"/>
                 </Button>
             </Grid>