转档高保真，打印-BUG

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

@@ -1089,24 +1089,7 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                             PageRangeSelectIndex = 4;
                         }
                     }
-                    if (parameters.TryGetValue<int>(ParameterNames.PrintCurrentPage, out currentPage))
-                    {
-                        PrintSettingsInfo.PageRangeList = PageList;
-                        System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
-                        {
-                            PageRangeSelectIndex = 1;
-                        }));
-                    }
                 }
-                //else if (parameters.TryGetValue<int>(ParameterNames.PrintCurrentPage, out currentPage))
-                //{
-                //    PrintSettingsInfo.PageRangeList = PageList;
-                //    PrintSettingsInfo.PageRangeList[0]--;
-                //    System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
-                //    {
-                //        PageRangeSelectIndex = 1;
-                //    }));
-                //}
 
                 System.Windows.Size pageSize = PDFViewer.Document.GetPageSize(0);
 

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

@@ -22,14 +22,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1" >
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" VerticalAlignment="Top">
+                <Grid Grid.Column="0" VerticalAlignment="Top" Margin="0,0,0,0">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Margin="16,2,0,0">
+                    <StackPanel Margin="0,2,0,0">
                         <TextBlock
                                 Height="20"
                                 Style="{StaticResource PropertyHeaderLv2}"
@@ -63,7 +63,7 @@
                                 Text="{Binding T_PageRange}" />
                             <cus:WritableComboBox
                                 x:Name="PageRangeComboBox"
-                                Width="228"
+                                Width="208"
                                 Height="32"
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"

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

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" VerticalAlignment="Top"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical" Margin="16,2,0,0">
+                    <StackPanel Orientation="Vertical" Margin="0,2,0,0">
                         <StackPanel Orientation="Vertical">
                             <TextBlock Text="{Binding T_Settings}" Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
                             <StackPanel Orientation="Vertical" Margin="0,10,0,0">

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

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <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="16,2,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
                         <StackPanel Orientation="Vertical" Visibility="Collapsed">
                             <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}">
@@ -43,7 +43,7 @@
                         </StackPanel>
                         <StackPanel Orientation="Vertical" Margin="0,0,0,0" >
                             <TextBlock Text="{Binding T_PageRange}" 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">
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" 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}" />

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

@@ -22,14 +22,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212" />
+                    <ColumnDefinition Width="244" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Margin="16,2,0,0">
+                    <StackPanel Margin="0,2,0,0">
                         <StackPanel>
                             <TextBlock
                                 Style="{StaticResource PropertyHeaderLv2}"
@@ -38,7 +38,7 @@
                                 Text="{Binding T_Format}" />
                             <ComboBox
                                 Name="ImageTypeComboBox"
-                                Width="228"
+                                Width="208"
                                 Height="32"
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
@@ -47,7 +47,7 @@
                                 />
                             <!--<ComboBox
                                 Name="ImageDPIComboBox"
-                                Width="228"
+                                Width="208"
                                 Height="32"
                                 Margin="0,8,0,0"
                                 HorizontalAlignment="Left"
@@ -63,7 +63,7 @@
                                 Text="{Binding T_PageRange}" />
                             <cus:WritableComboBox
                                 x:Name="PageRangeComboBox"
-                                Width="228"
+                                Width="208"
                                 Height="32"
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"

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

@@ -20,20 +20,20 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <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="16,2,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
                         <StackPanel Orientation="Vertical" Visibility="Collapsed">
                             <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="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
+                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="208" 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

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <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="16,2,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
                         <StackPanel Orientation="Vertical" Visibility="Collapsed">
                             <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">
@@ -43,7 +43,7 @@
                         </StackPanel>
                         <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                             <TextBlock Text="{Binding T_PageRange}" 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">
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" 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}" />

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

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <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="16,2,0,0">
+                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
                         <StackPanel Orientation="Vertical" Visibility="Collapsed">
                             <TextBlock Text="Text 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" >
@@ -43,7 +43,7 @@
                         </StackPanel>
                         <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                             <TextBlock Text="{Binding T_PageRange}" 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">
+                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" 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}" />

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

@@ -20,14 +20,14 @@
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212"/>
+                    <ColumnDefinition Width="244"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
                     <cus:PageTurningPreview  x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"/>
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical" Margin="16,2,0,0">
+                    <StackPanel Orientation="Vertical" Margin="0,2,0,0">
                         <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Visibility="Collapsed">
                             <TextBlock Text="Layout Settings"  Style="{StaticResource PropertyHeaderLv2}" Height="20" HorizontalAlignment="Left"/>
                             <StackPanel Orientation="Vertical" Margin="0,8,0,0">
@@ -47,7 +47,7 @@
                                 <CheckBox Name="OCRCheckBox"  Margin="0,8,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="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
+                                <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="208" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
                                     <ComboBoxItem Content="Chinese Simplified"/>
                                     <ComboBoxItem Content="Chinese Traditional"/>
                                     <ComboBoxItem Content="English"/>
@@ -57,7 +57,7 @@
                             </StackPanel>
                             <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                                 <TextBlock Text="{Binding T_PageRange}" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
-                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,8,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">
+                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,8,0,0" Width="208" 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}" />