其他

PDF Office/ViewModels/EditTools/Background/BackgroundCreateColorContentViewModel.cs

@@ -4,6 +4,7 @@ using PDF_Office.EventAggregators;
 using PDF_Office.Helper;
 using PDF_Office.Model;
 using PDF_Office.Model.EditTools.Background;
+using PDF_Office.Model.EditTools.HeaderFooter;
 using PDF_Office.Model.EditTools.Watermark;
 using PDF_Office.Properties;
 using PDFSettings;
@@ -499,6 +500,7 @@ namespace PDF_Office.ViewModels.EditTools.Background
             HorizontalOffsetValue = (BackgroundInfo.HorizOffset).ToString();
             VerticalOffsetValue = (BackgroundInfo.VertOffset).ToString();
             PageRangeSelectIndex = BackgroundInfo.PageRangeIndex;
+            if (BackgroundInfo.PageRangeIndex == 3) { PageRangeSelectIndex = 0; }
             IsRelativeScaleValue = BackgroundInfo.IsRelativeScale;
         }
 

PDF Office/ViewModels/EditTools/Background/BackgroundCreateFileContentViewModel.cs

@@ -349,6 +349,7 @@ namespace PDF_Office.ViewModels.EditTools.Background
             HorizontalOffsetValue = (BackgroundInfo.HorizOffset).ToString();
             VerticalOffsetValue = (BackgroundInfo.VertOffset).ToString();
             PageRangeSelectIndex = BackgroundInfo.PageRangeIndex;
+            if (BackgroundInfo.PageRangeIndex == 3) { PageRangeSelectIndex = 0; }
         }
 
         public void ChangeLocation(object e)

PDF Office/ViewModels/EditTools/Bates/BatesCreateContentViewModel.cs

@@ -749,7 +749,8 @@ namespace PDF_Office.ViewModels.EditTools.Bates
             StringColor = EditToolsHelper.ConvertColor(BatesInfo.TextData[0].Color);
             SolidColorBrush = new SolidColorBrush(StringColor);
             PageRangeSelectIndex = BatesInfo.PageRangeIndex;
-            PageRangeText=BatesInfo.PageRange;
+            if (BatesInfo.PageRangeIndex == 3) { PageRangeSelectIndex = 0; }
+            PageRangeText =BatesInfo.PageRange;
         }
         public bool IsNavigationTarget(NavigationContext navigationContext)
         {

PDF Office/ViewModels/EditTools/HeaderFooter/HeaderFooterCreateContentViewModel.cs

@@ -767,6 +767,7 @@ namespace PDF_Office.ViewModels.EditTools.HeaderFooter
             StringColor = EditToolsHelper.ConvertColor(HeaderFooterInfo.TextData[0].Color);
             SolidColorBrush = new SolidColorBrush(StringColor);
             PageRangeSelectIndex = HeaderFooterInfo.PageRangeIndex;
+            if (HeaderFooterInfo.PageRangeIndex == 3) { PageRangeSelectIndex = 0; }
 
         }
 

PDF Office/ViewModels/EditTools/Watermark/WatermarkCreateFileContentViewModel.cs

@@ -718,6 +718,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             VerticalSpacingValue = WatermarkInfo.VerticalSpacing.ToString();
             HorizontalSpacingValue = WatermarkInfo.HorizontalSpacing.ToString();
             PageRangeSelectIndex = WatermarkInfo.PageRangeIndex;
+            if (WatermarkInfo.PageRangeIndex == 3) { PageRangeSelectIndex = 0; }
             IsFrontSelectedIndex = Convert.ToInt32(!WatermarkInfo.IsFront);
             RotationText = WatermarkInfo.Rotation.ToString();
             OpacityText = WatermarkInfo.Opacity.ToString() + " %";

PDF Office/ViewModels/EditTools/Watermark/WatermarkCreateTextContentViewModel.cs

@@ -754,6 +754,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             VerticalSpacingValue = WatermarkInfo.VerticalSpacing.ToString();
             HorizontalSpacingValue = WatermarkInfo.HorizontalSpacing.ToString();
             PageRangeSelectIndex = WatermarkInfo.PageRangeIndex;
+            if (WatermarkInfo.PageRangeIndex == 3) { PageRangeSelectIndex = 0; }
             FontNameSelectedIndex = FontNameList.IndexOf(WatermarkInfo.FontName);
             FontSizeSelectedIndex = FontSizeList.IndexOf(((int)(WatermarkInfo.TextSize / 1.33f)).ToString() + "pt");
             IsFrontSelectedIndex = Convert.ToInt32(!WatermarkInfo.IsFront);

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

@@ -31,12 +31,12 @@
                 <Grid Grid.Column="1">
                     <StackPanel Margin="18,16,0,0">
                         <StackPanel>
-                            <RadioButton
+                            <!--<RadioButton
                                 Name="ForEachPageRadioBtn"
                                 Command="{Binding RadioButtonCommand}"
                                 CommandParameter="{Binding ElementName=ForEachPageRadioBtn, Path=Name}">
                                 <TextBlock Text="将每个页面转换为一个单独的文档" />
-                            </RadioButton>
+                            </RadioButton>-->
                             <RadioButton
                                 Name="OnlyTableRadioBtn"
                                 Margin="0,6,0,0"

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

@@ -45,7 +45,7 @@
                                 ItemsSource="{Binding ImageTypeFamily}"
                                 SelectedIndex="{Binding ImageTypeSelectedIndex, Mode=TwoWay}"
                                 />
-                            <ComboBox
+                            <!--<ComboBox
                                 Name="ImageDPIComboBox"
                                 Width="228"
                                 Height="32"
@@ -53,7 +53,7 @@
                                 HorizontalAlignment="Left"
                                 ItemsSource="{Binding ImageDPIFamily}"
                                 SelectedIndex="{Binding ImageDPISelectedIndex, Mode=TwoWay}"
-                                />
+                                />-->
                         </StackPanel>
                         <StackPanel Margin="0,16,0,0">
                             <TextBlock

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundDialog.xaml

@@ -114,13 +114,13 @@
                     </Grid>
                 </Popup>
 
-                <Button
+                <!--<Button
                     Width="40"
                     Height="40"
                     Margin="0,0,90,0"
                     HorizontalAlignment="Right">
 
-                </Button>
+                </Button>-->
                 <Button
                     Width="40"
                     Height="40"

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesDialog.xaml

@@ -114,13 +114,13 @@
                     </Grid>
                 </Popup>
 
-                <Button
+                <!--<Button
                     Width="40"
                     Height="40"
                     Margin="0,0,90,0"
                     HorizontalAlignment="Right">
 
-                </Button>
+                </Button>-->
                 <Button
                     Width="40"
                     Height="40"

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageCompressDialog.xaml

@@ -108,13 +108,13 @@
                     </Grid>
                 </Popup>
 
-                <Button
+                <!--<Button
                     Width="40"
                     Height="40"
                     Margin="0,0,90,0"
                     HorizontalAlignment="Right">
 
-                </Button>
+                </Button>-->
                 <Button
                     Width="40"
                     Height="40"

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterCSV.xaml

@@ -5,9 +5,9 @@
              prism:ViewModelLocator.AutoWireViewModel="True">
     <Grid>
         <StackPanel Width="245">
-            <RadioButton Name="ForEachPageRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=ForEachPageRadioBtn,Path=Name}">
+            <!--<RadioButton Name="ForEachPageRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=ForEachPageRadioBtn,Path=Name}">
                 <TextBlock Text="将每个页面转换为一个单独的文档"/>
-            </RadioButton>
+            </RadioButton>-->
             <RadioButton Margin="0,6,0,0" Name="OnlyTableRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=ForTheDocRadioBtn,Path=Name}">
                 <TextBlock Text="只提取表格"/>
             </RadioButton>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterDialog.xaml

@@ -114,13 +114,13 @@
                     </Grid>
                 </Popup>
 
-                <Button
+                <!--<Button
                     Width="40"
                     Height="40"
                     Margin="0,0,90,0"
                     HorizontalAlignment="Right">
 
-                </Button>
+                </Button>-->
                 <Button
                     Width="40"
                     Height="40"

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterImg.xaml

@@ -7,7 +7,7 @@
         <StackPanel Width="245">
             <TextBlock Text="文件类型" Height="20" Width="48" HorizontalAlignment="Left" />
             <ComboBox Name="ImageTypeComboBox" Height="32" Width="228" HorizontalAlignment="Left" Margin="0,8,0,0" ItemsSource="{Binding ImageTypeFamily}" SelectedIndex="0" SelectionChanged="ImageTypeComboBox_SelectionChanged"></ComboBox>
-            <ComboBox Name="ImageDPIComboBox" Height="32" Width="228" HorizontalAlignment="Left" Margin="0,8,0,0" ItemsSource="{Binding ImageDPIFamily}" SelectedIndex="0" SelectionChanged="ImageDPIComboBox_SelectionChanged"></ComboBox>
+            <!--<ComboBox Name="ImageDPIComboBox" Height="32" Width="228" HorizontalAlignment="Left" Margin="0,8,0,0" ItemsSource="{Binding ImageDPIFamily}" SelectedIndex="0" SelectionChanged="ImageDPIComboBox_SelectionChanged"></ComboBox>-->
         </StackPanel>
     </Grid>
 </UserControl>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterImg.xaml.cs

@@ -22,31 +22,32 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.H
 
             ((HomePageConverterImgViewModel)this.DataContext).UpdateImageType(ImageTypeComboBox.SelectedIndex);
         }
-        private void ImageDPIComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            switch (ImageDPIComboBox.SelectedIndex)
-            {
-                case 0:
-                    Trace.WriteLine("50");
-                    break;
-                case 1:
-                    Trace.WriteLine("72");
-                    break;
-                case 2:
-                    Trace.WriteLine("96");
-                    break;
-                case 3:
-                    Trace.WriteLine("150");
-                    break;
-                case 4:
-                    Trace.WriteLine("300");
-                    break;
-                case 5:
-                    Trace.WriteLine("600");
-                    break;
-                default:
-                    break;
-            }
-        }
+        //图片dpi
+        //private void ImageDPIComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        //{
+        //    switch (ImageDPIComboBox.SelectedIndex)
+        //    {
+        //        case 0:
+        //            Trace.WriteLine("50");
+        //            break;
+        //        case 1:
+        //            Trace.WriteLine("72");
+        //            break;
+        //        case 2:
+        //            Trace.WriteLine("96");
+        //            break;
+        //        case 3:
+        //            Trace.WriteLine("150");
+        //            break;
+        //        case 4:
+        //            Trace.WriteLine("300");
+        //            break;
+        //        case 5:
+        //            Trace.WriteLine("600");
+        //            break;
+        //        default:
+        //            break;
+        //    }
+        //}
     }
 }

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageHeaderFooter/HomePageHeaderFooterDialog.xaml

@@ -114,13 +114,13 @@
                     </Grid>
                 </Popup>
 
-                <Button
+                <!--<Button
                     Width="40"
                     Height="40"
                     Margin="0,0,90,0"
                     HorizontalAlignment="Right">
 
-                </Button>
+                </Button>-->
                 <Button
                     Width="40"
                     Height="40"

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageRemoveDialog.xaml

@@ -111,13 +111,13 @@
                     </Grid>
                 </Popup>
 
-                <Button
+                <!--<Button
                     Width="40"
                     Height="40"
                     Margin="0,0,90,0"
                     HorizontalAlignment="Right">
 
-                </Button>
+                </Button>-->
                 <Button
                     Width="40"
                     Height="40"

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageSetPasswordDialog.xaml

@@ -107,13 +107,13 @@
                     </Grid>
                 </Popup>
 
-                <Button
+                <!--<Button
                     Width="40"
                     Height="40"
                     Margin="0,0,90,0"
                     HorizontalAlignment="Right">
 
-                </Button>
+                </Button>-->
                 <Button
                     Width="40"
                     Height="40"

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkCreateTextContent.xaml

@@ -41,11 +41,11 @@
                     <ComboBox Width="66" Height="32" Margin="8,0,0,0" ItemsSource="{Binding FontSizeList}" SelectedIndex="{Binding FontSizeSelectedIndex}" IsEnabled="{Binding ElementName=RelativeScaleCheckBox, Path=IsChecked, Converter={StaticResource InvertBoolConvert}}"></ComboBox>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
-                    <StackPanel Orientation="Horizontal">
+                    <!--<StackPanel Orientation="Horizontal">
                         <Button Width="34.67" Height="32"></Button>
                         <Button Width="34.67" Height="32"></Button>
                         <Button Width="34.67" Height="32"></Button>
-                    </StackPanel>
+                    </StackPanel>-->
                     <CompositeControl:ColorContent x:Name="cusColor" Height="32" Width="66"  Margin="8,0,0,0" >
 
                     </CompositeControl:ColorContent>

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkDialog.xaml

@@ -114,13 +114,13 @@
                     </Grid>
                 </Popup>
 
-                <Button
+                <!--<Button
                     Width="40"
                     Height="40"
                     Margin="0,0,90,0"
                     HorizontalAlignment="Right">
 
-                </Button>
+                </Button>-->
                 <Button
                     Width="40"
                     Height="40"

PDF Office/Views/EditTools/Watermark/WatermarkCreateTextContent.xaml

@@ -41,11 +41,11 @@
                     <ComboBox Width="66" Height="32" Margin="8,0,0,0" ItemsSource="{Binding FontSizeList}" SelectedIndex="{Binding FontSizeSelectedIndex}" IsEnabled="{Binding ElementName=RelativeScaleCheckBox, Path=IsChecked, Converter={StaticResource InvertBoolConvert}}"></ComboBox>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
-                    <StackPanel Orientation="Horizontal">
+                    <!--<StackPanel Orientation="Horizontal">
                         <Button Width="34.67" Height="32"></Button>
                         <Button Width="34.67" Height="32"></Button>
                         <Button Width="34.67" Height="32"></Button>
-                    </StackPanel>
+                    </StackPanel>-->
                     <CompositeControl:ColorContent x:Name="cusColor" Height="32" Width="66"  Margin="8,0,0,0" >
                         
                     </CompositeControl:ColorContent>