ComPDFKit(win) - 调整项目配置

Demo/Examples/Annotations/Annotations.csproj

@@ -112,9 +112,9 @@
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

Demo/Examples/Annotations/MainWindow.xaml.cs

@@ -259,7 +259,7 @@ namespace AnnotationViewControl
         private void LoadCustomControl()
         {
             regularViewerControl.InitWithPDFViewer(pdfViewer);
-            regularViewerControl.PdfViewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+            regularViewerControl.PdfViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
             regularViewerControl.SetBOTAContainer(null);
             regularViewerControl.SetBOTAContainer(botaBarControl);
             regularViewerControl.SetDisplaySettingsControl(displaySettingsControl);
@@ -336,7 +336,7 @@ namespace AnnotationViewControl
                 if (regularViewerControl.PdfViewControl != null && regularViewerControl.PdfViewControl.PDFViewTool != null)
                 {
                     PDFGrid.Child = regularViewerControl;
-                    regularViewerControl.PdfViewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+                    regularViewerControl.PdfViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
                     regularViewerControl.InitWithPDFViewer(pdfViewer);
                     regularViewerControl.SetBOTAContainer(botaBarControl);
                     regularViewerControl.SetDisplaySettingsControl(displaySettingsControl);
@@ -347,7 +347,7 @@ namespace AnnotationViewControl
                 if (annotationControl.PDFViewControl != null && annotationControl.PDFViewControl.PDFViewTool != null)
                 {
                     PDFGrid.Child = annotationControl;
-                    annotationControl.PDFViewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+                    annotationControl.PDFViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
                     annotationControl.InitWithPDFViewer(pdfViewer);
                     annotationControl.SetBOTAContainer(botaBarControl);
                     annotationControl.SetDisplaySettingsControl(displaySettingsControl);

Demo/Examples/ContentEditor/ContentEditor.csproj

@@ -118,9 +118,9 @@
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

Demo/Examples/ContentEditor/MainWindow.xaml.cs

@@ -285,7 +285,7 @@ namespace ContentEditorViewControl
                 if (regularViewerControl.PdfViewControl != null && regularViewerControl.PdfViewControl.PDFViewTool != null)
                 {
                     PDFGrid.Child = regularViewerControl;
-                    regularViewerControl.PdfViewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+                    regularViewerControl.PdfViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
                     regularViewerControl.PdfViewControl = viewControl;
                     regularViewerControl.InitWithPDFViewer(viewControl);
                     regularViewerControl.SetBOTAContainer(botaBarControl);
@@ -300,7 +300,7 @@ namespace ContentEditorViewControl
                 if (contentEditControl.pdfContentEditControl != null && contentEditControl.PdfViewControl!= null)
                 {
                     PDFGrid.Child = contentEditControl;
-                    viewControl.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.ContentEdit);
+                    viewControl.SetToolType(ToolType.ContentEdit);
                     contentEditControl.OnCanSaveChanged -= ControlOnCanSaveChanged;
                     contentEditControl.OnCanSaveChanged += ControlOnCanSaveChanged;
                     contentEditControl.SetBOTAContainer(botaBarControl);

Demo/Examples/DigitalSignature/DigitalSignature.csproj

@@ -143,9 +143,9 @@
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

Demo/Examples/DigitalSignature/MainWindow.xaml.cs

@@ -186,7 +186,7 @@ namespace DigitalSignature
         {
             regularViewerControl.PdfViewControl = pdfViewer;
             regularViewerControl.InitWithPDFViewer(pdfViewer);
-            regularViewerControl.PdfViewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+            regularViewerControl.PdfViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
             regularViewerControl.SetBOTAContainer(null);
             regularViewerControl.SetBOTAContainer(botaBarControl);
             regularViewerControl.SetDisplaySettingsControl(displaySettingsControl);
@@ -201,7 +201,6 @@ namespace DigitalSignature
             signatureStatusBarControl.OnViewSignatureButtonClicked += ViewAllSignatures;
             
             SignatureHelper.VerifySignatureList(pdfViewer.GetCPDFViewer().GetDocument());
-            digitalSignatureControl.LoadUndoManagerEvent(pdfViewer.GetCPDFViewer());
             signatureStatusBarControl.SetStatus(SignatureHelper.SignatureList);
             regularViewerControl.SetSignatureStatusBarControl(signatureStatusBarControl);
         }
@@ -436,7 +435,7 @@ namespace DigitalSignature
                 if (regularViewerControl.PdfViewControl != null)
                 {
                     PDFGrid.Child = regularViewerControl;
-                    regularViewerControl.PdfViewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+                    regularViewerControl.PdfViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
                     regularViewerControl.PdfViewControl = pdfViewer;
                     regularViewerControl.InitWithPDFViewer(pdfViewer);
                     regularViewerControl.SetBOTAContainer(botaBarControl);
@@ -449,13 +448,12 @@ namespace DigitalSignature
                 if (digitalSignatureControl.PDFViewControl != null)
                 {
                     PDFGrid.Child = digitalSignatureControl;
-                    digitalSignatureControl.PDFViewControl.PDFViewTool.SetViewerModel(MouseModes.WidgetEditTool);
+                    digitalSignatureControl.PDFViewControl.PDFToolManager.SetToolType(ToolType.WidgetEdit);
                     digitalSignatureControl.PDFViewControl = pdfViewer;
                     digitalSignatureControl.InitWithPDFViewer(pdfViewer);
                     digitalSignatureControl.SetBOTAContainer(botaBarControl);
                     digitalSignatureControl.SetDisplaySettingsControl(displaySettingsControl);
                     digitalSignatureControl.SetSignatureStatusBarControl(signatureStatusBarControl);
-                    //pdfViewer.PDFViewTool.SetViewerModel(MouseModes.PanTool);
                 }
             }
             currentMode = item.Content as string;

Demo/Examples/DocsEditor/DocsEditor.csproj

@@ -124,9 +124,9 @@
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

Demo/Examples/DocsEditor/MainWindow.xaml.cs

@@ -82,7 +82,7 @@ namespace DocsEditor
             {
                 return;
             }
-            pdfViewControl.PDFViewTool?.SetViewerModel(MouseModes.Viewer);
+            pdfViewControl.PDFToolManager?.SetToolType(ToolType.Viewer);
             if (ViewComboBox.SelectedIndex == 0)
             {
                 PDFGrid.Child = pdfViewControl;

Demo/Examples/Forms/Forms.csproj

@@ -129,9 +129,9 @@
     <Resource Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Demo/Examples/Forms/MainWindow.xaml.cs

@@ -13,6 +13,7 @@ using System.Windows.Controls.Primitives;
 using Compdfkit_Tools.PDFView;
 using ComPDFKitViewer;
 using ComPDFKit.PDFDocument;
+using ComPDFKit.Tool;
 
 namespace FormViewControl
 {
@@ -280,7 +281,7 @@ namespace FormViewControl
                 if (regularViewerControl.PdfViewControl != null && regularViewerControl.PdfViewControl.PDFToolManager != null)
                 {
                     PDFGrid.Child = regularViewerControl;
-                    regularViewerControl.PdfViewControl.PDFToolManager.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.Viewer);
+                    regularViewerControl.PdfViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
                     regularViewerControl.PdfViewControl = pdfViewer;
                     regularViewerControl.InitWithPDFViewer(pdfViewer);
                     regularViewerControl.SetBOTAContainer(botaBarControl);
@@ -294,7 +295,7 @@ namespace FormViewControl
                     PDFGrid.Child = formControl;
                     if (T)
                     {
-                        formControl.PdfViewControl.PDFToolManager.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+                        formControl.PdfViewControl.PDFToolManager.SetToolType(ToolType.WidgetEdit);
                     }
                     if (IsLoaded)
                     {

Demo/Examples/Measure/MainWindow.xaml.cs

@@ -114,11 +114,11 @@ namespace Measure
             }
             if(ViewModeBox!=null && ViewModeBox.SelectedIndex==1)
             {
-                pdfViewControl.PDFViewTool?.SetViewerModel(ComPDFKit.Tool.MouseModes.PanTool);
+                pdfViewControl.PDFToolManager?.SetToolType(ToolType.Pan);
             }
             else
             {
-                pdfViewControl.PDFViewTool?.SetViewerModel(ComPDFKit.Tool.MouseModes.Viewer);
+                pdfViewControl.PDFToolManager?.SetToolType(ToolType.Viewer);
             }
             
             PasswordUI.Closed -= PasswordUI_Closed;
@@ -633,7 +633,7 @@ namespace Measure
                 RightPanelButton.IsChecked = false;
                 if (pdfViewControl != null && pdfViewControl.PDFViewTool != null)
                 {
-                    pdfViewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+                    pdfViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
                     pdfViewControl.PDFViewTool.GetDefaultSettingParam().IsOpenMeasure = false;
                 }
                 RightPanelButton.Visibility = Visibility.Collapsed;
@@ -647,7 +647,7 @@ namespace Measure
                 LoadMeasureRes();
                 if (pdfViewControl != null && pdfViewControl.PDFViewTool != null)
                 {
-                    pdfViewControl.PDFViewTool.SetViewerModel(MouseModes.PanTool);
+                    pdfViewControl.PDFToolManager.SetToolType(ToolType.Pan);
                     pdfViewControl.PDFViewTool.GetDefaultSettingParam().IsOpenMeasure = true;
                 }
             }

Demo/Examples/Measure/Measure.csproj

@@ -144,9 +144,9 @@
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

Demo/Examples/PDFViewer/PDFViewer.csproj

@@ -236,9 +236,9 @@
       <Project>{783263cf-0da3-4095-9df8-2c4a6b3ff908}</Project>
       <Name>ComPDFKit.Viewer</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Demo/Examples/Viewer/MainWindow.xaml.cs

@@ -1,7 +1,6 @@
 using ComPDFKit.PDFDocument;
 using Compdfkit_Tools.Helper;
 using Compdfkit_Tools.PDFControl;
-using ComPDFKitViewer;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
@@ -19,6 +18,7 @@ using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using ComPDFKit.PDFPage;
 using ComPDFKit.Tool;
+using ComPDFKitViewer;
 
 namespace Viewer
 {
@@ -60,7 +60,6 @@ namespace Viewer
         #endregion
 
 
-
         public MainWindow()
         {
             InitializeComponent();
@@ -81,7 +80,7 @@ namespace Viewer
             {
                 return;
             }
-            pdfViewControl.PDFToolManager?.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.Viewer);
+            pdfViewControl.PDFToolManager?.SetToolType(ToolType.Viewer);
             PDFGrid.Child = pdfViewControl;
             PasswordUI.Closed -= PasswordUI_Closed;
             PasswordUI.Canceled -= PasswordUI_Canceled;

Demo/Examples/Viewer/Viewer.csproj

@@ -125,9 +125,9 @@
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>