其他 - 替换form模块代码

Demo/Examples/Compdfkit_Tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs

@@ -1,5 +1,7 @@
-using ComPDFKit.Tool;
+using ComPDFKit.PDFDocument;
+using ComPDFKit.Tool;
 using ComPDFKitViewer;
+using Nager.Country.Currencies;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -30,6 +32,17 @@ namespace Compdfkit_Tools.PDFControl
             PDFToolManager.SetToolType(CPDFToolManager.ToolType.Viewer);
         }
 
+        public void InitDocument(string Path)
+        {
+            CPDFDocument pdfDoc = CPDFDocument.InitWithFilePath(Path);
+            if (pdfDoc != null)
+            {
+                PDFViewTool.GetCPDFViewer().InitDoc(pdfDoc);
+
+                PDFViewTool.GetCPDFViewer().SetFitMode(FitModes.FitHeight);
+            }
+        }
+
         private void PDFViewControl_MouseWheelZoomHandler(object sender, ComPDFKitViewer.MouseWheelZoomArgs e)
         {
             if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))

Demo/Examples/Compdfkit_Tools/PDFView/RegularViewerControl.xaml.cs

@@ -180,8 +180,16 @@ namespace Compdfkit_Tools.PDFView
         }
 
         #endregion
-        
-        
+
+        public void ClearViewerControl()
+        {
+            PDFGrid.Child = null;
+            BotaContainer.Child = null;
+            PropertyContainer.Child = null;
+            SignatureStatusBorder.Child = null;
+            displaySettingsControl = null;
+        }
+
         #region PropertyChanged
 
         /// <summary>

Demo/Examples/Forms/MainWindow.xaml.cs

@@ -9,6 +9,8 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using Compdfkit_Tools.PDFView;
+using ComPDFKitViewer;
+using ComPDFKit.PDFDocument;
 
 namespace FormViewControl
 {
@@ -89,20 +91,14 @@ namespace FormViewControl
         private void LoadDefaultDocument()
         {
             string defaultFilePath = "PDF32000_2008.pdf";
-            pdfViewer.PDFView.InitDocument(defaultFilePath);
+            pdfViewer.InitDocument(defaultFilePath);
             LoadDocument();
         }
 
         private void LoadDocument()
         {
-            pdfViewer.PDFView.Load();
-            pdfViewer.PDFView.SetShowLink(true);
-            
-            pdfViewer.PDFView.InfoChanged -= PdfViewer_InfoChanged;
-            pdfViewer.PDFView.InfoChanged += PdfViewer_InfoChanged;
-            
             formControl.PdfViewControl = pdfViewer;
-            formControl.InitWithPDFViewer(pdfViewer.PDFView);
+            formControl.InitWithPDFViewer(pdfViewer);
             
             formControl.ClearAllToolState();
             formControl.ExpandRightPropertyPanel(null, Visibility.Collapsed);
@@ -112,7 +108,6 @@ namespace FormViewControl
             formControl.OnAnnotEditHandler -= PdfFormControlRefreshAnnotList;
             formControl.OnAnnotEditHandler += PdfFormControlRefreshAnnotList;
             
-            formControl.PdfViewControl.PDFView.SetFormFieldHighlight(true);
             PasswordUI.Closed -= PasswordUI_Closed;
             PasswordUI.Canceled -= PasswordUI_Canceled;
             PasswordUI.Confirmed -= PasswordUI_Confirmed;
@@ -122,12 +117,12 @@ namespace FormViewControl
             
             ModeComboBox.SelectedIndex = 1;
             formControl.SetToolBarContainerVisibility(Visibility.Visible);
-            formControl.PdfViewControl.PDFView.ChangeFitMode(FitMode.FitWidth);
-            CPDFSaclingControl.InitWithPDFViewer(formControl.PdfViewControl.PDFView);
-            CPDFSaclingControl.SetZoomTextBoxText(string.Format("{0}", (int)(formControl.PdfViewControl.PDFView.ZoomFactor * 100)));
+            formControl.PdfViewControl.PDFViewTool.GetCPDFViewer().SetFitMode(FitModes.FitWidth);
+            CPDFSaclingControl.InitWithPDFViewer(formControl.PdfViewControl);
+            CPDFSaclingControl.SetZoomTextBoxText(string.Format("{0}", (int)(formControl.PdfViewControl.PDFViewTool.GetCPDFViewer().GetZoom() * 100)));
             
             ViewSettingBtn.IsChecked = false;
-            botaBarControl.InitWithPDFViewer(formControl.PdfViewControl.PDFView);
+            botaBarControl.InitWithPDFViewer(formControl.PdfViewControl);
             botaBarControl.SelectBotaTool(BOTATools.Thumbnail);
             formControl.SetBOTAContainer(botaBarControl);
             formControl.InitialPDFViewControl(formControl.PdfViewControl);
@@ -141,9 +136,9 @@ namespace FormViewControl
             string filePath = CommonHelper.GetExistedPathOrEmpty();
             if (!string.IsNullOrEmpty(filePath) && formControl.PdfViewControl != null)
             {
-                if (pdfViewer.PDFView != null && pdfViewer.PDFView.Document != null)
+                if (pdfViewer.PDFViewTool != null && pdfViewer.PDFToolManager.GetDocument() != null)
                 {
-                    string oldFilePath = pdfViewer.PDFView.Document.FilePath;
+                    string oldFilePath = pdfViewer.PDFToolManager.GetDocument().FilePath;
                     if (oldFilePath.ToLower() == filePath.ToLower())
                     {
                         return;
@@ -151,14 +146,14 @@ namespace FormViewControl
                 }
 
                 passwordViewer = new PDFViewControl();
-                passwordViewer.PDFView.InitDocument(filePath);
-                if (passwordViewer.PDFView.Document == null)
+                passwordViewer.InitDocument(filePath);
+                if (passwordViewer.PDFToolManager.GetDocument() == null)
                 {
                     MessageBox.Show("Open File Failed");
                     return;
                 }
 
-                if (passwordViewer.PDFView.Document.IsLocked)
+                if (passwordViewer.PDFToolManager.GetDocument().IsLocked)
                 {
                     PasswordUI.SetShowText(System.IO.Path.GetFileName(filePath) + " password encrypted.");
                     PasswordUI.ClearPassword();
@@ -167,7 +162,7 @@ namespace FormViewControl
                 }
                 else
                 {
-                    pdfViewer.PDFView.Document.Release();
+                    passwordViewer.PDFToolManager.GetDocument().Release();
                     pdfViewer = passwordViewer;
                     LoadDocument();
                 }
@@ -184,10 +179,10 @@ namespace FormViewControl
         #region Password
         private void PasswordUI_Confirmed(object sender, string e)
         {
-            if (passwordViewer != null && passwordViewer.PDFView != null && passwordViewer.PDFView.Document != null)
+            if (passwordViewer != null && passwordViewer.PDFViewTool != null && passwordViewer.PDFToolManager.GetDocument() != null)
             {
-                passwordViewer.PDFView.Document.UnlockWithPassword(e);
-                if (passwordViewer.PDFView.Document.IsLocked == false)
+                passwordViewer.PDFToolManager.GetDocument().UnlockWithPassword(e);
+                if (passwordViewer.PDFToolManager.GetDocument().IsLocked == false)
                 {
                     PasswordUI.SetShowError("", Visibility.Collapsed);
                     PasswordUI.ClearPassword();
@@ -240,7 +235,6 @@ namespace FormViewControl
         private void SaveFileBtn_Click(object sender, RoutedEventArgs e)
         {
             SaveFile();
-            pdfViewer.PDFView.UndoManager.CanSave = false;
         }
 
         private void OpenFile_Click(object sender, RoutedEventArgs e)
@@ -273,24 +267,24 @@ namespace FormViewControl
             
             if ((string)item.Content == "Viewer")
             {
-                if (regularViewerControl.PdfViewControl != null && regularViewerControl.PdfViewControl.PDFView != null)
+                if (regularViewerControl.PdfViewControl != null && regularViewerControl.PdfViewControl.PDFToolManager != null)
                 {
                     PDFGrid.Child = regularViewerControl;
-                    regularViewerControl.PdfViewControl.PDFView.SetMouseMode(MouseModes.Viewer);
+                    regularViewerControl.PdfViewControl.PDFToolManager.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.Viewer);
                     regularViewerControl.PdfViewControl = pdfViewer;
-                    regularViewerControl.InitWithPDFViewer(pdfViewer.PDFView);
+                    regularViewerControl.InitWithPDFViewer(pdfViewer);
                     regularViewerControl.SetBOTAContainer(botaBarControl);
                     regularViewerControl.SetDisplaySettingsControl(displaySettingsControl);
                 }
             }
             else if ((string)item.Content == "Form")
             {
-                if (formControl.PdfViewControl != null && formControl.PdfViewControl.PDFView != null)
+                if (formControl.PdfViewControl != null && formControl.PdfViewControl.PDFToolManager != null)
                 {
                     PDFGrid.Child = formControl;
-                    formControl.PdfViewControl.PDFView.SetMouseMode(MouseModes.FormEditTool);
+                    formControl.PdfViewControl.PDFToolManager.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.FormEdit);
                     formControl.PdfViewControl = pdfViewer;
-                    formControl.InitWithPDFViewer(pdfViewer.PDFView);
+                    formControl.InitWithPDFViewer(pdfViewer);
                     formControl.SetBOTAContainer(botaBarControl);
                     formControl.SetDisplaySettingsControl(displaySettingsControl);
                 }
@@ -302,7 +296,7 @@ namespace FormViewControl
         {
             PasswordUI.Visibility = Visibility.Collapsed;
             FileInfoUI.Visibility = Visibility.Visible;
-            FileInfoControl.InitWithPDFViewer(pdfViewer.PDFView);
+            FileInfoControl.InitWithPDFViewer(pdfViewer);
             PopupBorder.Visibility = Visibility.Visible;
         }
 
@@ -366,9 +360,9 @@ namespace FormViewControl
         public void SaveAsFile()
         {
             {
-                if (pdfViewer != null && pdfViewer.PDFView != null && pdfViewer.PDFView.Document != null)
+                if (pdfViewer != null && pdfViewer.PDFToolManager != null && pdfViewer.PDFToolManager.GetDocument() != null)
                 {
-                    CPDFDocument pdfDoc = pdfViewer.PDFView.Document;
+                    CPDFDocument pdfDoc = pdfViewer.PDFToolManager.GetDocument();
                     SaveFileDialog saveDialog = new SaveFileDialog();
                     saveDialog.Filter = "(*.pdf)|*.pdf";
                     saveDialog.DefaultExt = ".pdf";
@@ -387,11 +381,11 @@ namespace FormViewControl
         /// </summary>
         private void SaveFile()
         {
-            if (pdfViewer != null && pdfViewer.PDFView != null && pdfViewer.PDFView.Document != null)
+            if (pdfViewer != null && pdfViewer.PDFToolManager != null && pdfViewer.PDFToolManager.GetDocument() != null)
             {
                 try
                 {
-                    CPDFDocument pdfDoc = pdfViewer.PDFView.Document;
+                    CPDFDocument pdfDoc = pdfViewer.PDFToolManager.GetDocument();
                     if (pdfDoc.WriteToLoadedPath())
                     {
                         return;