compdfkit(win) - 移动水印

Demo/Examples/Compdfkit_Tools/Common/BaseControl/NumericUpDownControl.xaml.cs

@@ -8,7 +8,8 @@ namespace Compdfkit_Tools.Common
 {
     public partial class NumericUpDownControl : UserControl
     {
-        private string regixString = "[^0-9]+";
+        private string regixString = "[^0-9-]";
+        private string nRegixString = @"[^0-9-]+";
 
         // The dependency property which will be accessible on the UserControl
         public static readonly DependencyProperty UnitProperty =
@@ -51,7 +52,15 @@ namespace Compdfkit_Tools.Common
         }
         private void TextBox_PreviewTextInput(object sender, TextCompositionEventArgs e)
         {
-            e.Handled = new Regex(regixString).IsMatch(e.Text);
+            if (Minimum > 0)
+            {
+                e.Handled = new Regex(regixString).IsMatch(e.Text);
+            }
+            else
+            {
+                e.Handled = new Regex(nRegixString).IsMatch(e.Text);
+
+            }
         }
 
         private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)

Demo/Examples/Compdfkit_Tools/Common/PropertyControl/PDFLocation/CPDFRotationControl.xaml.cs

@@ -22,6 +22,7 @@ namespace Compdfkit_Tools.Common
     /// </summary>
     public partial class CPDFRotationControl : UserControl, INotifyPropertyChanged
     {
+
         private string _rotationText = "0";
         public string RotationText
         {
@@ -29,7 +30,7 @@ namespace Compdfkit_Tools.Common
             set
             {
                 if (string.IsNullOrEmpty(value))
-                {
+                { 
                     return;
                 }
 

Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj

@@ -483,32 +483,32 @@
     <Compile Include="PDFView\PDFScaling\PDFScalingUI\CPDFScalingUI.xaml.cs">
       <DependentUpon>CPDFScalingUI.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Security\Watermark\AddWatermark\FileGridListWithPageRangeControl.xaml.cs">
+    <Compile Include="Watermark\AddWatermark\FileGridListWithPageRangeControl.xaml.cs">
       <DependentUpon>FileGridListWithPageRangeControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Security\Watermark\AddWatermark\PageRangeDialog.xaml.cs">
+    <Compile Include="Watermark\AddWatermark\PageRangeDialog.xaml.cs">
       <DependentUpon>PageRangeDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Common\PreviewControl\PreviewControl.xaml.cs">
       <DependentUpon>PreviewControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Security\Watermark\RemoveWatermark\RemoveWatermarkListControl.xaml.cs">
+    <Compile Include="Watermark\RemoveWatermark\RemoveWatermarkListControl.xaml.cs">
       <DependentUpon>RemoveWatermarkListControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Security\Watermark\RemoveWatermark\RemoveWatermarkListDialog.xaml.cs">
+    <Compile Include="Watermark\RemoveWatermark\RemoveWatermarkListDialog.xaml.cs">
       <DependentUpon>RemoveWatermarkListDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Security\Watermark\WatermarkData.cs" />
-    <Compile Include="Security\Watermark\AddWatermark\WatermarkDialog.xaml.cs">
+    <Compile Include="Watermark\WatermarkData.cs" />
+    <Compile Include="Watermark\AddWatermark\WatermarkDialog.xaml.cs">
       <DependentUpon>WatermarkDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Security\Watermark\AddWatermark\WatermarkListDialog.xaml.cs">
+    <Compile Include="Watermark\AddWatermark\WatermarkListDialog.xaml.cs">
       <DependentUpon>WatermarkListDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Security\Watermark\WatermarkOperationTypeDialog.xaml.cs">
+    <Compile Include="Watermark\WatermarkOperationTypeDialog.xaml.cs">
       <DependentUpon>WatermarkOperationTypeDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Security\Watermark\AddWatermark\WatermarkPreviewControl.cs" />
+    <Compile Include="Watermark\AddWatermark\WatermarkPreviewControl.cs" />
     <Compile Include="Strings\Bota.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -1160,11 +1160,11 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="PDFView\RegularViewerControl.xaml" />
-    <Page Include="Security\Watermark\AddWatermark\FileGridListWithPageRangeControl.xaml">
+    <Page Include="Watermark\AddWatermark\FileGridListWithPageRangeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Security\Watermark\AddWatermark\PageRangeDialog.xaml">
+    <Page Include="Watermark\AddWatermark\PageRangeDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -1172,23 +1172,23 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Security\Watermark\AddWatermark\WatermarkDialog.xaml">
+    <Page Include="Watermark\AddWatermark\WatermarkDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Security\Watermark\AddWatermark\WatermarkListDialog.xaml">
+    <Page Include="Watermark\AddWatermark\WatermarkListDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Security\Watermark\RemoveWatermark\RemoveWatermarkListControl.xaml">
+    <Page Include="Watermark\RemoveWatermark\RemoveWatermarkListControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Security\Watermark\RemoveWatermark\RemoveWatermarkListDialog.xaml">
+    <Page Include="Watermark\RemoveWatermark\RemoveWatermarkListDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Security\Watermark\WatermarkOperationTypeDialog.xaml">
+    <Page Include="Watermark\WatermarkOperationTypeDialog.xaml">
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>

Demo/Examples/Compdfkit_Tools/Security/Watermark/AddWatermark/PageRangeDialog.xaml

@@ -14,7 +14,7 @@
             <cpdfcommon:SecurityResourceConverter x:Key="SecurityResourceConverter"/> 
             <cpdfcommon:TextLengthToVisibilityConverter x:Key="TextLengthToVisibilityConverter"></cpdfcommon:TextLengthToVisibilityConverter>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../../../Asset/Styles/RadioButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="../../Asset/Styles/RadioButtonStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

Demo/Examples/Compdfkit_Tools/Security/Watermark/AddWatermark/WatermarkDialog.xaml

@@ -15,9 +15,9 @@
             <common:SecurityResourceConverter x:Key="SecurityResourceConverter"/>
             <common:StringToVisibilityConverter x:Key="StringToVisibilityConverter"></common:StringToVisibilityConverter>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../../../Asset/Styles/RadioButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="../../../Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="../../../Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="../../Asset/Styles/RadioButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="../../Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="../../Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

Demo/Examples/Compdfkit_Tools/Security/Watermark/WatermarkOperationTypeDialog.xaml

@@ -13,8 +13,8 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../../Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="../../Asset/Styles/RadioButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="../Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="../Asset/Styles/RadioButtonStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             <common:SecurityResourceConverter x:Key="SecurityResourceConverter"/>
         </ResourceDictionary>