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

PDF Office/CustomControl/PageTurningPreview.xaml

@@ -8,11 +8,23 @@
              Height="320" Width="212">
     <Border Width="212" Height="320" Background="{StaticResource color.sys.layout.mg}"  CornerRadius="8">
         <StackPanel Orientation="Vertical" Height="320">
-            <Border  Margin="0,16,0,0" HorizontalAlignment="Center" VerticalAlignment="Top" Background="{StaticResource color.sys.layout.mg}" Height="248" Width="180" CornerRadius="4" BorderBrush="{StaticResource color.sys.layout.divider}" BorderThickness="1">
-                <Viewbox>
-                    <Image Name="Image" Height="248" Width="180" >
-                    </Image>
-                </Viewbox>
+            <Border Margin="0,16,0,0" HorizontalAlignment="Center" VerticalAlignment="Top" Background="{StaticResource color.sys.layout.mg}" Height="248" Width="180">
+                <Border HorizontalAlignment="Center" VerticalAlignment="Center" CornerRadius="{StaticResource border-radius.8}" BorderBrush="{StaticResource color.sys.layout.divider}" BorderThickness="1">
+                    <Grid>
+                        <Border
+                        Name="BorderImage"
+                        Background="White"
+                        CornerRadius="{StaticResource border-radius.8}" />
+                        <Image
+                        Name="Image"
+                        RenderOptions.BitmapScalingMode="HighQuality"
+                        UseLayoutRounding="True">
+                            <Image.OpacityMask>
+                                <VisualBrush Visual="{Binding ElementName=BorderImage}" />
+                            </Image.OpacityMask>
+                        </Image>
+                    </Grid>
+                </Border>
             </Border>
             <StackPanel Orientation="Horizontal"  Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,16,0,0" Width="155">
                 <Button Name="PrePage" Width="24" Click="PrePage_Click" Height="24" HorizontalAlignment="Left" FontSize="16" BorderBrush="{StaticResource color.field.border.norm}"  Background="{StaticResource color.field.bg.def}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" >

PDF Office/ViewModels/Dialog/SignatureCreateDialogViewModel.cs

@@ -221,7 +221,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             }
         }
 
-        private int thicknessListIndex = 3;
+        private int thicknessListIndex = 1;
 
         public int ThicknessListIndex
         {
@@ -259,7 +259,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             DrawingAttributeObject = new DrawingAttributes();
             StrokesObject = new StrokeCollection();
             FontNameList = new ObservableCollection<string>();
-            ThicknessList = new ObservableCollection<string>() {"0.5pt", "1.0pt", "1.5pt", "2.0pt", "2.5pt", "3.0pt" };//改了这里记得去改ThicknessListIndex的Set方法里面的取值
+            ThicknessList = new ObservableCollection<string>() {"1.0pt", "2.0pt", "4.0pt", "6.0pt", "8.0pt" };//改了这里记得去改ThicknessListIndex的Set方法里面的取值
             CancelCommand = new DelegateCommand(Cancel);
             CreateCommnad = new DelegateCommand(Create);
             UpdataDrawingStrokesCommnad = new DelegateCommand(UpdataDrawingStrokes);

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -245,7 +245,6 @@ namespace PDF_Master.ViewModels
 
         public string ReadModeRegionName { get; set; }
 
-        public string ConverterBarContentRegionName { get; set; }
 
         public string TextEditContentRegionName { get; set; }
 
@@ -815,7 +814,6 @@ namespace PDF_Master.ViewModels
             OCRViewerRegionName = RegionNames.OCRViewerRegionName;
             ToolContentRegionName = Guid.NewGuid().ToString();
             ToolsBarContentRegionName = Guid.NewGuid().ToString();
-            ConverterBarContentRegionName = Guid.NewGuid().ToString();
             TextEditContentRegionName = Guid.NewGuid().ToString();
 
             ToolContentVisible = Visibility.Collapsed;
@@ -1442,7 +1440,7 @@ namespace PDF_Master.ViewModels
             dictionary.Add("TabItemTool", ToolsBarContentRegionName);
             //其他工具菜单栏共用一个ToolsBarContentRegionName
             dictionary.Add("TabItemAnnotation", ToolsBarContentRegionName);
-            dictionary.Add("TabItemConvert", ConverterBarContentRegionName);
+            dictionary.Add("TabItemConvert", ToolsBarContentRegionName);
             dictionary.Add("TabItemScan", ToolsBarContentRegionName);
             dictionary.Add("TabItemEdit", TextEditContentRegionName);
             dictionary.Add("TabItemForm", ToolsBarContentRegionName);

PDF Office/Views/BOTA/SearchContent.xaml

@@ -73,10 +73,8 @@
                             BorderThickness="{TemplateBinding Border.BorderThickness}"
                             CornerRadius="4"
                             SnapsToDevicePixels="True">
-
-
-                            <Border.ContextMenu>
-                                <ContextMenu>
+                            <Border.ContextMenu >
+                                <ContextMenu Visibility="Collapsed">
                                     <MenuItem
                                         Click="Create_Click"
                                         Header="加入新圆形"
@@ -402,6 +400,7 @@
         </Grid>
         <Grid Grid.Row="2">
             <ListView
+                SelectionMode="Single"
                 Name="SearchResultList"
                 BorderThickness="0"
               MouseLeftButtonDown="SearchResultList_MouseLeftButtonDown"

PDF Office/Views/ViewContent.xaml

@@ -414,11 +414,11 @@
             prism:RegionManager.RegionName="{Binding ToolsBarContentRegionName}"
             Visibility="{Binding ToolsBarContentVisible}" />
 
-        <ContentControl
+        <!--<ContentControl
             Name="ContentConverterBar"
             Grid.Row="{Binding GridToolRow}"
-            prism:RegionManager.RegionName="{Binding ConverterBarContentRegionName}"
-            Visibility="{Binding ConverterBarContentVisible}" />
+            prism:RegionManager.RegionName="{Binding ToolsBarContentRegionName}"
+            Visibility="{Binding ConverterBarContentVisible}" />-->
 
         <ContentControl
             Name="TextEditContentBar"