Selaa lähdekoodia

compdfkit(win) - 更新证书,新增0.4透明度logo,填写签名设置Name

weixiangjie 1 vuosi sitten
vanhempi
commit
42415fafda

+ 47 - 0
Demo/Examples/Compdfkit_Tools/DigitalSignature/FillDigitalSignatureControl/FillDigitalSignatureControl.xaml

@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Compdfkit_Tools.PDFControl"
+             xmlns:common="clr-namespace:Compdfkit_Tools.Common"
              mc:Ignorable="d" 
              d:DesignHeight="530" d:DesignWidth="630" 
              >
@@ -169,6 +170,52 @@
                 <Button x:Name="ContinueBtn" Grid.Column="4" Margin="10,0,25,0" Height="32" Width="97" Style="{StaticResource ButtonStyle}" Click="ContinueBtn_Click">Continue</Button>
             </Grid>
         </Grid>
+        
+        <Border Name="KeyboardPopup" Background="#A0000000" Visibility="Collapsed">
+            <Grid Background="White" Width="628" Height="412">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="32" />
+                        <RowDefinition Height="240" />
+                        <RowDefinition Height="48" />
+                        <RowDefinition Height="48" />
+                    </Grid.RowDefinitions>
+                <Button HorizontalAlignment="Right" Margin="0,8,10,0" Style="{StaticResource LightButtonStyle}" BorderThickness="0"
+                        Background="White" Width="24" Height="24" Click="KeyboardPopupClose_Click">
+                    <Button.Content>
+                        <Path Fill="#43474D" Width="16" Height="16">
+                            <Path.Data>
+                                M12.6466 13.2531L13.0001 13.6066L13.7072 12.8995L13.3537 12.546L8.7072 7.8995L13.2532 3.35352L13.6067 2.99997L12.8996 
+                                2.29286L12.5461 2.64642L8.00009 7.19239L3.45418 2.64648L3.10063 2.29292L2.39352 3.00003L2.74708 3.35358L7.29299 
+                                7.8995L2.64657 12.5459L2.29302 12.8995L3.00013 13.6066L3.35368 13.253L8.0001 8.6066L12.6466 13.2531Z
+                            </Path.Data>
+                        </Path>
+                    </Button.Content>
+                </Button>
+                    <TextBox     
+                    x:Name="KeyboardInPutTextBox" Grid.Row="1" BorderThickness="0" Background="#F2F3F5" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="45"/>
+                    <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10">
+                        <TextBlock Text="Font" VerticalAlignment="Center"/>
+                        <ComboBox x:Name="TextName" Width="232" SelectedIndex="0" HorizontalAlignment="Left" VerticalAlignment="Center" 
+                                  Style="{StaticResource ComboBoxStyle1}" Margin="8,0,0,0" SelectionChanged="TextName_SelectionChanged">
+                            <ComboBoxItem Content="Arial"/>
+                            <ComboBoxItem Content="Courier New" IsSelected="True"/>
+                            <ComboBoxItem Content="Times New Roman"/>
+                        </ComboBox>
+                    </StackPanel>
+                    <StackPanel Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal" Margin="0,10,10,0">
+                        <common:ColorPickerControl x:Name="TextColorPickerControl" Loaded="TextColorPickerControl_Loaded" ColorChanged="TextColorPickerControl_ColorChanged" TransparentBtnProperty="Collapsed"></common:ColorPickerControl>
+                    </StackPanel>
+                    <Grid Grid.Row="3" Margin="11,20,11,0" VerticalAlignment="Top">
+                        <Button Height="32" Width="82" Style="{StaticResource LightButtonStyle}" Background="#DFE9FF" 
+                                BorderThickness="0" HorizontalAlignment="Left" Content="Clear" Click="KeyboardClear_Click"/>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                            <Button Height="32" Width="82" Style="{StaticResource LightButtonStyle}" Background="#DFE9FF" 
+                                    BorderThickness="0" Content="Cancel" Click="KeyboardCancel_Click"/>
+                            <Button x:Name="SaveBtn" Margin="10,0,25,0" Height="32" Width="97" Style="{StaticResource ButtonStyle}" Content="Save" Click="KeyboardSave_Click"/>
+                        </StackPanel>
+                    </Grid>
+                </Grid>
+        </Border>
 
         <Border Name="CanvaDrawPopup" Background="#A0000000" Visibility="Collapsed">
             <Grid Background="White" Width="628" Height="412">

+ 54 - 18
Demo/Examples/Compdfkit_Tools/DigitalSignature/FillDigitalSignatureControl/FillDigitalSignatureControl.xaml.cs

@@ -20,6 +20,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+using Color = System.Drawing.Color;
 using Pen = System.Windows.Media.Pen;
 using PixelFormat = System.Windows.Media.PixelFormat;
 using Point = System.Windows.Point;
@@ -33,7 +34,7 @@ namespace Compdfkit_Tools.PDFControl
     public partial class FillDigitalSignatureControl : UserControl
     {
 
-        private readonly string logoPath = "Logo.png";
+        private readonly string logoPath = "Logo_opa40.png";
         private string imagePath = string.Empty;
         private string Text = string.Empty;
         private Dictionary<string, Border> TabDict { get; set; }
@@ -49,6 +50,8 @@ namespace Compdfkit_Tools.PDFControl
         private string location = string.Empty;
 
         private string reason = string.Empty;
+        
+        private float[] textColor = new float[] { 0, 0, 0 };
 
         private string _signaturePath = string.Empty;
         public string SignaturePath
@@ -112,11 +115,9 @@ namespace Compdfkit_Tools.PDFControl
             if (tempSignatureConfig.IsDrawLogo)
             {
                 tempSignatureConfig.LogoBitmap = new Bitmap(logoPath);
-                //set logoBitmap opacity to 0.4
-                tempSignatureConfig.LogoBitmap = SetImageOpacity(tempSignatureConfig.LogoBitmap, 0.4f);
             }
             tempSignatureConfig.Content = Text;
-            tempSignatureConfig.textColor = new float[] { 0, 0, 0 };
+            tempSignatureConfig.textColor = textColor;
             tempSignatureConfig.contentColor = new float[] { 0, 0, 0 };
             signatureWidget.UpdataApWithSignature(tempSignatureConfig);
 
@@ -136,20 +137,6 @@ namespace Compdfkit_Tools.PDFControl
             }
         }
 
-        private Bitmap SetImageOpacity(Bitmap bitmap, float f)
-        {
-            Bitmap resultBitmap = new Bitmap(bitmap.Width, bitmap.Height);
-            using (Graphics g = Graphics.FromImage(resultBitmap))
-            {
-                ColorMatrix matrix = new ColorMatrix();
-                matrix.Matrix33 = f;
-                ImageAttributes attributes = new ImageAttributes();
-                attributes.SetColorMatrix(matrix, ColorMatrixFlag.Default, ColorAdjustType.Bitmap);
-                g.DrawImage(bitmap, new Rectangle(0, 0, resultBitmap.Width, resultBitmap.Height), 0, 0, bitmap.Width, bitmap.Height, GraphicsUnit.Pixel, attributes);
-            }
-            return resultBitmap;
-        }
-
         public static byte[] GetTempSignatureImage(CPDFSignatureWidget signatureWidget, out int width, out int height)
         {
             CRect rect = signatureWidget.GetRect();
@@ -209,6 +196,7 @@ namespace Compdfkit_Tools.PDFControl
                 {
                     tempSignatureConfig.Text = signatureName;
                     tempSignatureConfig.ImageBitmap = null;
+                    KeyboardPopup.Visibility = Visibility.Visible;
                 }
                 else
                 {
@@ -570,5 +558,53 @@ namespace Compdfkit_Tools.PDFControl
             Window parentWindow = Window.GetWindow(sender as DependencyObject);
             parentWindow?.Close();
         }
+        
+        private void TextName_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (TextName.SelectedIndex != -1)
+            {
+                KeyboardInPutTextBox.FontFamily = new System.Windows.Media.FontFamily(TextName.SelectionBoxItem.ToString());
+            }
+        }
+
+        private void TextColorPickerControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            TextColorPickerControl.SetIsChecked(0);
+        }
+
+        private void TextColorPickerControl_ColorChanged(object sender, EventArgs e)
+        {
+            KeyboardInPutTextBox.Foreground = TextColorPickerControl.Brush;
+        }
+
+        private void KeyboardCancel_Click(object sender, RoutedEventArgs e)
+        {
+            KeyboardPopup.Visibility = Visibility.Collapsed;
+        }
+
+        private void KeyboardClear_Click(object sender, RoutedEventArgs e)
+        {
+            KeyboardInPutTextBox.Text = string.Empty;
+        }
+
+        private void KeyboardSave_Click(object sender, RoutedEventArgs e)
+        {
+            signatureName = KeyboardInPutTextBox.Text;
+            tempSignatureConfig.Text = signatureName;
+            SolidColorBrush solidColorBrush = TextColorPickerControl.Brush as SolidColorBrush;
+            float red = solidColorBrush.Color.R;
+            float green = solidColorBrush.Color.G;
+            float blue = solidColorBrush.Color.B;
+            textColor = new [] { red / 255, green / 255, blue / 255};
+
+            KeyboardPopup.Visibility = Visibility.Collapsed;
+            SetProperty();
+            CreateTempSignature();
+        }
+
+        private void KeyboardPopupClose_Click(object sender, RoutedEventArgs e)
+        {
+            KeyboardPopup.Visibility = Visibility.Collapsed;
+        }
     }
 }

+ 3 - 0
Demo/Examples/DigitalSignature/DigitalSignature.csproj

@@ -107,6 +107,9 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="Logo_opa40.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Resource Include="ComPDFKit_Logo.ico" />
     <None Include="ComPDFKit.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

BIN
Demo/Examples/DigitalSignature/Logo_opa40.png


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 5
Demo/Examples/license_key_windows.xml