2 Commits 70f22cf646 ... ab056ced46

Author SHA1 Message Date
  zhuyi ab056ced46 Merge branch 'compdfkit_demo_win_rebuild' of http://git.kdan.cc:8865/Others/kmpdfkit_demo into compdfkit_demo_win_rebuild 9 months ago
  zhuyi dcd456fd49 综合-命名空间,方法名以及程序集名称调整 9 months ago
21 changed files with 110 additions and 74 deletions
  1. 2 2
      Demo/Examples/Compdfkit_Tools/Annotation/AnnotationControl/AnnotationControl.xaml.cs
  2. 3 3
      Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationList/PDFAnnotationListControl/CPDFAnnotationListControl.xaml.cs
  3. 4 4
      Demo/Examples/Compdfkit_Tools/Common/BarControl/CPDFMeasureBarControl.xaml.cs
  4. 9 9
      Demo/Examples/Compdfkit_Tools/Common/BarControl/FormBarControl.xaml.cs
  5. 18 0
      Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj
  6. 1 1
      Demo/Examples/Compdfkit_Tools/DigitalSignature/DigitalSignatureControl/CPDFSignatureListControl.xaml.cs
  7. 3 3
      Demo/Examples/Compdfkit_Tools/Edit/ContentEditCOntrol/ContentEditControl.xaml.cs
  8. 5 5
      Demo/Examples/Compdfkit_Tools/Edit/PDFImageEdit/PDFImageEditControl/PDFImageEditControl.xaml.cs
  9. 10 10
      Demo/Examples/Compdfkit_Tools/Edit/PDFTextEdit/PDFTextEditControl/PDFTextEditControl.xaml.cs
  10. 2 2
      Demo/Examples/Compdfkit_Tools/Form/FormControl/FormControl.xaml.cs
  11. 3 3
      Demo/Examples/Compdfkit_Tools/Form/FromPropertyControl.xaml.cs
  12. 1 1
      Demo/Examples/Compdfkit_Tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFDisplaySettingsControl.xaml.cs
  13. 8 8
      Demo/Examples/Compdfkit_Tools/PDFView/PDFScaling/PDFScalingControl/CPDFScalingControl.xaml.cs
  14. 1 1
      Demo/Examples/Compdfkit_Tools/PDFView/PDFSearch/PDFSearchUI/CPDFSearchInputUI.xaml.cs
  15. 1 1
      Demo/Examples/Compdfkit_Tools/PDFView/PDFThumbnail/PDFThumbnailControl/CPdfThumbnailControl.xaml.cs
  16. 10 10
      Demo/Examples/Compdfkit_Tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs
  17. 1 1
      Demo/Examples/Compdfkit_Tools/Watermark/AddWatermark/WatermarkDialog.xaml.cs
  18. 8 8
      Demo/Examples/Examlpes.sln
  19. 1 1
      Demo/Examples/Forms/MainWindow.xaml.cs
  20. 1 1
      Demo/Examples/PDFViewer/MainPage.xaml.cs
  21. 18 0
      Demo/Examples/PDFViewer/PDFViewer.csproj

+ 2 - 2
Demo/Examples/Compdfkit_Tools/Annotation/AnnotationControl/AnnotationControl.xaml.cs

@@ -695,7 +695,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 PDFViewControl.PDFViewTool.GetCPDFViewer().UndoManager?.Undo();
                 PDFViewControl.PDFToolManager.ClearSelect();
-                PDFViewControl.PDFViewTool.GetCPDFViewer().UpDateAnnotFrame();
+                PDFViewControl.PDFViewTool.GetCPDFViewer().UpdateAnnotFrame();
             }
         }
 
@@ -705,7 +705,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 PDFViewControl.PDFViewTool.GetCPDFViewer().UndoManager?.Redo();
                 PDFViewControl.PDFToolManager.ClearSelect();
-                PDFViewControl.PDFViewTool.GetCPDFViewer().UpDateAnnotFrame();
+                PDFViewControl.PDFViewTool.GetCPDFViewer().UpdateAnnotFrame();
             }
         }
 

+ 3 - 3
Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationList/PDFAnnotationListControl/CPDFAnnotationListControl.xaml.cs

@@ -50,7 +50,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 pdfViewer.PDFToolManager.ClearSelect();
                 ParamConverter.RemovePageAnnot(e, pdfViewer.PDFViewTool.GetCPDFViewer().GetDocument());
-                pdfViewer.PDFViewTool.GetCPDFViewer().UpDateAnnotFrame();
+                pdfViewer.PDFViewTool.GetCPDFViewer().UpdateAnnotFrame();
                 LoadAnnotationList();
             }
         }
@@ -163,7 +163,7 @@ namespace Compdfkit_Tools.PDFControl
         {
             var bindAnnotationResult = e as BindAnnotationResult;
             pdfViewer.PDFViewTool.GetCPDFViewer().GoToPage(bindAnnotationResult.PageIndex, new Point(0, 0));
-            pdfViewer.PDFViewTool.GetCPDFViewer().UpDateRenderFrame();
+            pdfViewer.PDFViewTool.GetCPDFViewer().UpdateRenderFrame();
             pdfViewer.PDFViewTool.SelectedAnnotForIndex(bindAnnotationResult.PageIndex, bindAnnotationResult.AnnotIndex);
         }
 
@@ -180,7 +180,7 @@ namespace Compdfkit_Tools.PDFControl
                 
             LoadAnnotationList();
             pdfViewer.PDFViewTool.GetCPDFViewer().UpdateVirtualNodes();
-            pdfViewer.PDFViewTool.GetCPDFViewer().UpDateRenderFrame();
+            pdfViewer.PDFViewTool.GetCPDFViewer().UpdateRenderFrame();
             //pdfViewer.UndoManager.CanSave = true;
         }
 

+ 4 - 4
Demo/Examples/Compdfkit_Tools/Common/BarControl/CPDFMeasureBarControl.xaml.cs

@@ -255,7 +255,7 @@ namespace Compdfkit_Tools.PDFControl
             lineMeasureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_LINE;
             lineMeasureParam.LineColor = new byte[] { 255, 0, 0, };
             lineMeasureParam.LineWidth = 2;
-            lineMeasureParam.Transparency = 1;
+            lineMeasureParam.Transparency = 255;
             lineMeasureParam.FontColor = new byte[] { 255, 0, 0, };
             lineMeasureParam.FontName = "Arial";
             lineMeasureParam.FontSize = 14;
@@ -294,7 +294,7 @@ namespace Compdfkit_Tools.PDFControl
             polyLineMeasureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_POLYLINE;
             polyLineMeasureParam.LineColor = new byte[] { 255, 0, 0, };
             polyLineMeasureParam.LineWidth = 2;
-            polyLineMeasureParam.Transparency = 1;
+            polyLineMeasureParam.Transparency = 255;
             polyLineMeasureParam.FontColor = new byte[] { 255, 0, 0, };
             polyLineMeasureParam.FontName = "Arial";
             polyLineMeasureParam.FontSize = 14;
@@ -338,7 +338,7 @@ namespace Compdfkit_Tools.PDFControl
             polygonMeasureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON;
             polygonMeasureParam.LineColor = new byte[] { 255, 0, 0, };
             polygonMeasureParam.LineWidth = 2;
-            polygonMeasureParam.Transparency = 1;
+            polygonMeasureParam.Transparency = 255;
             polygonMeasureParam.FontColor = new byte[] { 255, 0, 0, };
             polygonMeasureParam.FontName = "Arial";
             polygonMeasureParam.FontSize = 14;
@@ -384,7 +384,7 @@ namespace Compdfkit_Tools.PDFControl
             polygonMeasureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON;
             polygonMeasureParam.LineColor = new byte[] { 255, 0, 0, };
             polygonMeasureParam.LineWidth = 2;
-            polygonMeasureParam.Transparency = 1;
+            polygonMeasureParam.Transparency = 255;
             polygonMeasureParam.FontColor = new byte[] { 255, 0, 0, };
             polygonMeasureParam.FontName = "Arial";
             polygonMeasureParam.FontSize = 14;

+ 9 - 9
Demo/Examples/Compdfkit_Tools/Common/BarControl/FormBarControl.xaml.cs

@@ -213,11 +213,11 @@ namespace Compdfkit_Tools.PDFControl
                     default:
                         break;
                 }
-                pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+                pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             }
             else
             {
-                pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+                pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             }
         }
 
@@ -250,7 +250,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateTextBox()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_TEXTFIELD);
             TextBoxParam textBoxParam = new TextBoxParam();
             textBoxParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -267,7 +267,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateRadioBtn()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_RADIOBUTTON);
             RadioButtonParam radioButtonParam = new RadioButtonParam();
             radioButtonParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -285,7 +285,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateCheckBox()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_CHECKBOX);
             CheckBoxParam checkBoxParam = new CheckBoxParam();
             checkBoxParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -303,7 +303,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateComboBox()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_COMBOBOX);
             ComboBoxParam comboBoxParam = new ComboBoxParam();
             comboBoxParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -319,7 +319,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateListBox()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_LISTBOX);
             ListBoxParam listBoxParam = new ListBoxParam();
             listBoxParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -335,7 +335,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreatePushBtn()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_PUSHBUTTON);
             PushButtonParam pushButtonParam = new PushButtonParam();
             pushButtonParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -354,7 +354,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateSign()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_SIGNATUREFIELDS);
             SignatureParam signatureParam = new SignatureParam();
             signatureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;

+ 18 - 0
Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj

@@ -62,6 +62,24 @@
     <LangVersion>7</LangVersion>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Nager.Country, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nager.Country.4.0.0\lib\netstandard2.0\Nager.Country.dll</HintPath>

+ 1 - 1
Demo/Examples/Compdfkit_Tools/DigitalSignature/DigitalSignatureControl/CPDFSignatureListControl.xaml.cs

@@ -83,7 +83,7 @@ namespace Compdfkit_Tools.DigitalSignature.CPDFSignatureListControl
                 pdfViewer.PDFViewTool.GetCPDFViewer().GetDocument().RemoveSignature(signatureList[index], true);
                 widget.ResetForm();
                 widget.SetIsLocked(false);
-                pdfViewer.PDFViewTool.GetCPDFViewer().UpDateAnnotFrame();
+                pdfViewer.PDFViewTool.GetCPDFViewer().UpdateAnnotFrame();
                 DeleteSignatureEvent?.Invoke(this, null);
             }
         }

+ 3 - 3
Demo/Examples/Compdfkit_Tools/Edit/ContentEditCOntrol/ContentEditControl.xaml.cs

@@ -306,7 +306,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 PdfViewControl.PDFViewTool.GetCPDFViewer()?.UndoManager?.Undo();
                 //PdfViewControl.PDFToolManager.ClearSelect();
-                PdfViewControl.PDFViewTool.GetCPDFViewer().UpDateRenderFrame();
+                PdfViewControl.PDFViewTool.GetCPDFViewer().UpdateRenderFrame();
             }
         }
 
@@ -316,7 +316,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 PdfViewControl.PDFViewTool.GetCPDFViewer()?.UndoManager?.Redo();
                 //PdfViewControl.PDFToolManager.ClearSelect();
-                PdfViewControl.PDFViewTool.GetCPDFViewer().UpDateRenderFrame();
+                PdfViewControl.PDFViewTool.GetCPDFViewer().UpdateRenderFrame();
             }
         }
 
@@ -633,7 +633,7 @@ namespace Compdfkit_Tools.PDFControl
         private void UpdateCursor(CPDFEditTextArea textArea)
         {
             Rect oldRect = DataConversionForWPF.CRectConversionForRect(textArea.GetFrame());
-            PdfViewControl.PDFViewTool.UpDateRender(oldRect,textArea);
+            PdfViewControl.PDFViewTool.UpdateRender(oldRect,textArea);
         }
         
         private void PdfViewControl_MouseRightButtonDownHandler(object sender, MouseEventObject e)

+ 5 - 5
Demo/Examples/Compdfkit_Tools/Edit/PDFImageEdit/PDFImageEditControl/PDFImageEditControl.xaml.cs

@@ -133,7 +133,7 @@ namespace Compdfkit_Tools.Edit
                     }
 
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, imageArea);
+                    ToolView.UpdateRender(oldRect, imageArea);
                     editPage.EndEdit();
                 }
 
@@ -174,7 +174,7 @@ namespace Compdfkit_Tools.Edit
 
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
                     SetImageThumb();
-                    ToolView.UpDateRender(oldRect, imageArea);
+                    ToolView.UpdateRender(oldRect, imageArea);
                     editPage.EndEdit();
                 }
             }
@@ -220,7 +220,7 @@ namespace Compdfkit_Tools.Edit
 
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
                     SetImageThumb();
-                    ToolView.UpDateRender(oldRect, imageArea);
+                    ToolView.UpdateRender(oldRect, imageArea);
                     editPage.EndEdit();
                 }
             }
@@ -262,7 +262,7 @@ namespace Compdfkit_Tools.Edit
 
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
                     SetImageThumb();
-                    ToolView.UpDateRender(oldRect, imageArea);
+                    ToolView.UpdateRender(oldRect, imageArea);
                     editPage.EndEdit();
                 }
             }
@@ -297,7 +297,7 @@ namespace Compdfkit_Tools.Edit
 
                             ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
                             SetImageThumb();
-                            ToolView.UpDateRender(oldRect, imageArea);
+                            ToolView.UpdateRender(oldRect, imageArea);
                             editPage.EndEdit();
                         }
                     }

+ 10 - 10
Demo/Examples/Compdfkit_Tools/Edit/PDFTextEdit/PDFTextEditControl/PDFTextEditControl.xaml.cs

@@ -135,7 +135,7 @@ namespace Compdfkit_Tools.Edit
                     }
 
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -176,7 +176,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -213,7 +213,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -255,7 +255,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -309,7 +309,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -346,7 +346,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -386,7 +386,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -423,7 +423,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -459,7 +459,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }
@@ -495,7 +495,7 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
                     ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
-                    ToolView.UpDateRender(oldRect, textArea);
+                    ToolView.UpdateRender(oldRect, textArea);
                     editPage.EndEdit();
                 }
             }

+ 2 - 2
Demo/Examples/Compdfkit_Tools/Form/FormControl/FormControl.xaml.cs

@@ -214,7 +214,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 PdfViewControl.PDFViewTool.GetCPDFViewer().UndoManager?.Undo();
                 PdfViewControl.PDFToolManager.ClearSelect();
-                PdfViewControl.PDFViewTool.GetCPDFViewer().UpDateAnnotFrame();
+                PdfViewControl.PDFViewTool.GetCPDFViewer().UpdateAnnotFrame();
             }
         }
 
@@ -224,7 +224,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 PdfViewControl.PDFViewTool.GetCPDFViewer().UndoManager?.Redo();
                 PdfViewControl.PDFToolManager.ClearSelect();
-                PdfViewControl.PDFViewTool.GetCPDFViewer().UpDateAnnotFrame();
+                PdfViewControl.PDFViewTool.GetCPDFViewer().UpdateAnnotFrame();
             }
         }
 

+ 3 - 3
Demo/Examples/Compdfkit_Tools/Form/FromPropertyControl.xaml.cs

@@ -24,12 +24,12 @@ namespace Compdfkit_Tools.PDFControl
         public void SetPropertyForType(AnnotParam annotParam, CPDFAnnotation annotation, CPDFDocument cPDFDocument) 
         {
             currentPanel = null;
-            if (annotParam == null|| !(annotParam is FormParm))
+            if (annotParam == null|| !(annotParam is WidgetParm))
             {
                 SetAnnotationPanel(currentPanel);
                 return;
             }
-            switch ((annotParam as FormParm).WidgetType)
+            switch ((annotParam as WidgetParm).WidgetType)
             {
                 case ComPDFKit.PDFAnnotation.Form.C_WIDGET_TYPE.WIDGET_PUSHBUTTON:
                     PushButtonProperty pushButtonProperty = new PushButtonProperty();
@@ -62,7 +62,7 @@ namespace Compdfkit_Tools.PDFControl
                     currentPanel = listBoxProperty;
                     break;
                 case ComPDFKit.PDFAnnotation.Form.C_WIDGET_TYPE.WIDGET_SIGNATUREFIELDS:
-                    if (pdfViewerControl.PDFToolManager.GetToolType()==CPDFToolManager.ToolType.FormEdit)
+                    if (pdfViewerControl.PDFToolManager.GetToolType()==CPDFToolManager.ToolType.WidgetEdit)
                     {
                         CPDFSignatureUI signatureProperty = new CPDFSignatureUI();
                         signatureProperty.SetFormProperty(annotParam, pdfViewerControl, annotation);

+ 1 - 1
Demo/Examples/Compdfkit_Tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFDisplaySettingsControl.xaml.cs

@@ -59,7 +59,7 @@ namespace Compdfkit_Tools.PDFControl
                 if (pdfViewer != null)
                 {
                     pdfViewer?.SetViewMode(e);
-                    pdfViewer?.UpDateRenderFrame();
+                    pdfViewer?.UpdateRenderFrame();
                 }
             }
         }

+ 8 - 8
Demo/Examples/Compdfkit_Tools/PDFView/PDFScaling/PDFScalingControl/CPDFScalingControl.xaml.cs

@@ -78,17 +78,17 @@ namespace Compdfkit_Tools.PDFControl
             {
                 double newZoom = Math.Max(0.01, pdfViewer.GetZoom() - 0.1);
                 pdfViewer.SetZoom(newZoom);
-                pdfViewer.UpDateRenderFrame();
+                pdfViewer.UpdateRenderFrame();
             }
             else if (pdfViewer.GetZoom() < 6)
             {
                 pdfViewer.SetZoom(pdfViewer.GetZoom() - 0.2);
-                pdfViewer.UpDateRenderFrame();
+                pdfViewer.UpdateRenderFrame();
             }
             else if (pdfViewer.GetZoom() >6)
             {
                 pdfViewer.SetZoom(pdfViewer.GetZoom() - 0.3);
-                pdfViewer.UpDateRenderFrame();
+                pdfViewer.UpdateRenderFrame();
             }
             SetZoomTextBoxText(string.Format("{0}", (int)(pdfViewer.GetZoom() * 100)));
         }
@@ -108,18 +108,18 @@ namespace Compdfkit_Tools.PDFControl
             if (pdfViewer.GetZoom() < 3)
             {
                 pdfViewer.SetZoom(pdfViewer.GetZoom() + 0.1);
-                pdfViewer.UpDateRenderFrame();
+                pdfViewer.UpdateRenderFrame();
             }
             else if (pdfViewer.GetZoom() < 6)
             {
                 pdfViewer.SetZoom(pdfViewer.GetZoom() + 0.2);
-                pdfViewer.UpDateRenderFrame();
+                pdfViewer.UpdateRenderFrame();
             }
             else if (pdfViewer.GetZoom() <= 10)
             {
                 double newZoom = Math.Max(10, pdfViewer.GetZoom() + 0.3);
                 pdfViewer.SetZoom(newZoom);
-                pdfViewer.UpDateRenderFrame();
+                pdfViewer.UpdateRenderFrame();
             }
             SetZoomTextBoxText(string.Format("{0}", (int)(pdfViewer.GetZoom()* 100)));
         }
@@ -139,7 +139,7 @@ namespace Compdfkit_Tools.PDFControl
             if (!string.IsNullOrEmpty(e))
             {
                 pdfViewer.SetZoom(double.Parse(e) / 100);
-                pdfViewer.UpDateRenderFrame();
+                pdfViewer.UpdateRenderFrame();
                 SetZoomTextBoxText(string.Format("{0}", (int)(pdfViewer.GetZoom() * 100)));
             }
         }
@@ -172,7 +172,7 @@ namespace Compdfkit_Tools.PDFControl
                 pdfViewer.SetZoom(double.Parse(e) / 100);
             }
             SetZoomTextBoxText(string.Format("{0}", (int)(pdfViewer.GetZoom() * 100)));
-            pdfViewer.UpDateRenderFrame();
+            pdfViewer.UpdateRenderFrame();
         }
 
         public void SetZoomTextBoxText(string value)

+ 1 - 1
Demo/Examples/Compdfkit_Tools/PDFView/PDFSearch/PDFSearchUI/CPDFSearchInputUI.xaml.cs

@@ -82,5 +82,5 @@ namespace Compdfkit_Tools.PDFControlUI
             }
         }
     }
-
 }
+        

+ 1 - 1
Demo/Examples/Compdfkit_Tools/PDFView/PDFThumbnail/PDFThumbnailControl/CPdfThumbnailControl.xaml.cs

@@ -99,7 +99,7 @@ namespace Compdfkit_Tools.PDFControl
                 return;
             };
             pdfViewer.UpdateVirtualNodes();
-            pdfViewer.UpDateRenderFrame();
+            pdfViewer.UpdateRenderFrame();
             cachePageList.Clear();
             OnThumbnailGenerated -= ThumbnailGenerated;
             OnThumbnailGenerated += ThumbnailGenerated;

+ 10 - 10
Demo/Examples/Compdfkit_Tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs

@@ -159,7 +159,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void PDFViewTool_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            PDFViewTool.GetCPDFViewer().UpDateRenderFrame();
+            PDFViewTool.GetCPDFViewer().UpdateRenderFrame();
         }
 
         private void SplitViewerTool_SizeChanged(object sender, SizeChangedEventArgs e)
@@ -172,7 +172,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 splitHeightScale = HorizontalView.ActualHeight / ViewToolGrid.ActualHeight;
             }
-            splitViewerTool.GetCPDFViewer().UpDateRenderFrame();
+            splitViewerTool.GetCPDFViewer().UpdateRenderFrame();
         }
 
         public void InitDocument(string Path)
@@ -202,7 +202,7 @@ namespace Compdfkit_Tools.PDFControl
                 PDFViewTool.GetCPDFViewer().SetFitMode(FitMode.FitZoom);
                 double zoom = PDFViewTool.GetCPDFViewer().GetZoom();
                 PDFViewTool.GetCPDFViewer().SetZoom(CheckZoomLevel(zoom, Convert.ToBoolean(e.WheelBehavior)));
-                PDFViewTool?.GetCPDFViewer()?.UpDateRenderFrame();
+                PDFViewTool?.GetCPDFViewer()?.UpdateRenderFrame();
             }
             MouseWheelZoomHandler?.Invoke(this, e);
         }
@@ -217,7 +217,7 @@ namespace Compdfkit_Tools.PDFControl
                 splitViewerTool.GetCPDFViewer().SetFitMode(FitMode.FitZoom);
                 double zoom = splitViewerTool.GetCPDFViewer().GetZoom();
                 splitViewerTool.GetCPDFViewer().SetZoom(CheckZoomLevel(zoom, Convert.ToBoolean(e.WheelBehavior)));
-                splitViewerTool?.GetCPDFViewer()?.UpDateRenderFrame();
+                splitViewerTool?.GetCPDFViewer()?.UpdateRenderFrame();
             }
             MouseWheelZoomHandler?.Invoke(this, e);
         }
@@ -258,14 +258,14 @@ namespace Compdfkit_Tools.PDFControl
 
         public void UpdateRenderFrame()
         {
-            viewerTool?.GetCPDFViewer()?.UpDateRenderFrame();
-            splitViewerTool?.GetCPDFViewer()?.UpDateRenderFrame();
+            viewerTool?.GetCPDFViewer()?.UpdateRenderFrame();
+            splitViewerTool?.GetCPDFViewer()?.UpdateRenderFrame();
         }
 
         public void UpdateAnnotFrame()
         {
-            viewerTool?.GetCPDFViewer()?.UpDateAnnotFrame();
-            splitViewerTool?.GetCPDFViewer()?.UpDateAnnotFrame();
+            viewerTool?.GetCPDFViewer()?.UpdateAnnotFrame();
+            splitViewerTool?.GetCPDFViewer()?.UpdateAnnotFrame();
         }
 
         public void SetCropMode(bool isCrop)
@@ -276,8 +276,8 @@ namespace Compdfkit_Tools.PDFControl
             viewerTool?.GetCPDFViewer()?.UpdateVirtualNodes();
             splitViewerTool?.GetCPDFViewer()?.UpdateVirtualNodes();
 
-            viewerTool?.GetCPDFViewer()?.UpDateRenderFrame();
-            splitViewerTool?.GetCPDFViewer()?.UpDateRenderFrame();
+            viewerTool?.GetCPDFViewer()?.UpdateRenderFrame();
+            splitViewerTool?.GetCPDFViewer()?.UpdateRenderFrame();
 
         }
 

+ 1 - 1
Demo/Examples/Compdfkit_Tools/Watermark/AddWatermark/WatermarkDialog.xaml.cs

@@ -479,7 +479,7 @@ namespace Compdfkit_Tools.PDFControl
         {
             PreviewControl.DeleteDisplayWatermark();
             base.OnClosed(e);
-        }
+        }       
 
         private void LocationRdo_Checked(object sender, RoutedEventArgs e)
         {

+ 8 - 8
Demo/Examples/Examlpes.sln

@@ -161,8 +161,8 @@ Global
 		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|x64.ActiveCfg = Debug|x64
 		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|x64.Build.0 = Debug|x64
-		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|x86.Build.0 = Debug|Any CPU
+		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|x86.ActiveCfg = Debug|x86
+		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|x86.Build.0 = Debug|x86
 		{9363BCB1-3A67-446A-8093-5708B86BF418}.DemoTest|Any CPU.ActiveCfg = Debug|Any CPU
 		{9363BCB1-3A67-446A-8093-5708B86BF418}.DemoTest|Any CPU.Build.0 = Debug|Any CPU
 		{9363BCB1-3A67-446A-8093-5708B86BF418}.DemoTest|x64.ActiveCfg = Debug|Any CPU
@@ -555,8 +555,8 @@ Global
 		{C38954D1-7490-4D96-8AE7-67468EA3E638}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C38954D1-7490-4D96-8AE7-67468EA3E638}.Debug|x64.ActiveCfg = Debug|x64
 		{C38954D1-7490-4D96-8AE7-67468EA3E638}.Debug|x64.Build.0 = Debug|x64
-		{C38954D1-7490-4D96-8AE7-67468EA3E638}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C38954D1-7490-4D96-8AE7-67468EA3E638}.Debug|x86.Build.0 = Debug|Any CPU
+		{C38954D1-7490-4D96-8AE7-67468EA3E638}.Debug|x86.ActiveCfg = Debug|x86
+		{C38954D1-7490-4D96-8AE7-67468EA3E638}.Debug|x86.Build.0 = Debug|x86
 		{C38954D1-7490-4D96-8AE7-67468EA3E638}.DemoTest|Any CPU.ActiveCfg = Debug|Any CPU
 		{C38954D1-7490-4D96-8AE7-67468EA3E638}.DemoTest|Any CPU.Build.0 = Debug|Any CPU
 		{C38954D1-7490-4D96-8AE7-67468EA3E638}.DemoTest|x64.ActiveCfg = Debug|Any CPU
@@ -1059,8 +1059,8 @@ Global
 		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x64.ActiveCfg = Debug|x64
 		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x64.Build.0 = Debug|x64
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x86.Build.0 = Debug|Any CPU
+		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x86.ActiveCfg = Debug|x86
+		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x86.Build.0 = Debug|x86
 		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|Any CPU.ActiveCfg = DemoTest|Any CPU
 		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|Any CPU.Build.0 = DemoTest|Any CPU
 		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|x64.ActiveCfg = DemoTest|Any CPU
@@ -1077,8 +1077,8 @@ Global
 		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x64.ActiveCfg = Debug|x64
 		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x64.Build.0 = Debug|x64
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x86.Build.0 = Debug|Any CPU
+		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x86.ActiveCfg = Debug|x86
+		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x86.Build.0 = Debug|x86
 		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|Any CPU.ActiveCfg = DemoTest|Any CPU
 		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|Any CPU.Build.0 = DemoTest|Any CPU
 		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|x64.ActiveCfg = DemoTest|Any CPU

+ 1 - 1
Demo/Examples/Forms/MainWindow.xaml.cs

@@ -287,7 +287,7 @@ namespace FormViewControl
                     PDFGrid.Child = formControl;
                     if (T)
                     {
-                        formControl.PdfViewControl.PDFToolManager.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+                        formControl.PdfViewControl.PDFToolManager.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
                     }
                     if (IsLoaded)
                     {

+ 1 - 1
Demo/Examples/PDFViewer/MainPage.xaml.cs

@@ -535,7 +535,7 @@ namespace PDFViewer
                 if (formControl.PdfViewControl != null )
                 {
                     PDFGrid.Child = formControl;
-                    viewControl.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
+                    viewControl.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
                     formControl.OnCanSaveChanged -= ControlOnCanSaveChanged;
                     formControl.OnCanSaveChanged += ControlOnCanSaveChanged;
                     formControl.OnAnnotEditHandler -= PdfFormControlRefreshAnnotList;

+ 18 - 0
Demo/Examples/PDFViewer/PDFViewer.csproj

@@ -61,6 +61,24 @@
     <LangVersion>7</LangVersion>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;Windows</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Dragablz">
       <HintPath>.\Dragablz.dll</HintPath>