compdfkit(win) - 整理其他控件的代码

Demo/Examples/Compdfkit_Tools/Annotation/AnnotationControl/AnnotationControl.xaml.cs

@@ -100,29 +100,6 @@ namespace Compdfkit_Tools.PDFControl
             panelState.PropertyChanged += PanelState_PropertyChanged;
         }
 
-        private void PanelState_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(PanelState.IsLeftPanelExpand))
-            {
-                ExpandLeftPanel(panelState.IsLeftPanelExpand);
-            }
-            else if (e.PropertyName == nameof(PanelState.RightPanel))
-            {
-                if (panelState.RightPanel == PanelState.RightPanelState.PropertyPanel)
-                {
-                    ExpandRightPropertyPanel(PDFAnnotationControl, Visibility.Visible);
-                }
-                else if (panelState.RightPanel == PanelState.RightPanelState.ViewSettings)
-                {
-                    ExpandRightPropertyPanel(displaySettingsControl, Visibility.Visible);
-                }
-                else
-                {
-                    ExpandRightPropertyPanel(null, Visibility.Collapsed);
-                }
-            }
-        }
-
         #region Init PDFViewer
         public void InitWithPDFViewer(CPDFViewer pdfViewer)
         {
@@ -131,7 +108,18 @@ namespace Compdfkit_Tools.PDFControl
             FloatPageTool.InitWithPDFViewer(pdfViewer);
             InitialPDFViewControl(PDFViewControl);
         }
+        #endregion
+
+        #region Public Method
 
+        public void ClearViewerControl()
+        {
+            PDFGrid.Child = null;
+            BotaContainer.Child = null;
+            PropertyContainer.Child = null;
+            displaySettingsControl = null;
+        }
+        
         public void SetBOTAContainer(CPDFBOTABarControl botaControl)
         {
             this.BotaContainer.Child = botaControl;
@@ -151,6 +139,7 @@ namespace Compdfkit_Tools.PDFControl
         {
             this.ToolBarContainer.Visibility = visibility;
         }
+
         #endregion
 
         #region Load Unload custom control
@@ -662,7 +651,7 @@ namespace Compdfkit_Tools.PDFControl
         }
 
 
-        public void UndoManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void UndoManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnPropertyChanged(e.PropertyName);
             if (e.PropertyName == "CanSave")
@@ -670,6 +659,29 @@ namespace Compdfkit_Tools.PDFControl
                 OnCanSaveChanged?.Invoke(this, CanSave);
             }
         }
+        
+        private void PanelState_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(PanelState.IsLeftPanelExpand))
+            {
+                ExpandLeftPanel(panelState.IsLeftPanelExpand);
+            }
+            else if (e.PropertyName == nameof(PanelState.RightPanel))
+            {
+                if (panelState.RightPanel == PanelState.RightPanelState.PropertyPanel)
+                {
+                    ExpandRightPropertyPanel(PDFAnnotationControl, Visibility.Visible);
+                }
+                else if (panelState.RightPanel == PanelState.RightPanelState.ViewSettings)
+                {
+                    ExpandRightPropertyPanel(displaySettingsControl, Visibility.Visible);
+                }
+                else
+                {
+                    ExpandRightPropertyPanel(null, Visibility.Collapsed);
+                }
+            }
+        }
         #endregion
 
         #region Event handle
@@ -762,13 +774,6 @@ namespace Compdfkit_Tools.PDFControl
             AnnotationBarControl.SetAnnotationType(CPDFAnnotationType.Squiggly);
         }
         #endregion
-
-        public void ClearViewerControl()
-        {
-            PDFGrid.Child = null;
-            BotaContainer.Child = null;
-            PropertyContainer.Child = null;
-            displaySettingsControl = null;
-        }
+        
     }
 }

Demo/Examples/Compdfkit_Tools/Form/FormControl/FormControl.xaml.cs

@@ -83,65 +83,7 @@ namespace Compdfkit_Tools.PDFControl
             InitializeComponent();
             DataContext = this;
         }
-
-        private void PanelState_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(PanelState.IsLeftPanelExpand))
-            {
-                ExpandLeftPanel(panelState.IsLeftPanelExpand);
-            }
-            else if (e.PropertyName == nameof(PanelState.RightPanel))
-            {
-                if (panelState.RightPanel == PanelState.RightPanelState.PropertyPanel)
-                {
-                    ExpandRightPropertyPanel(FromPropertyControl, Visibility.Visible);
-                }
-                else if (panelState.RightPanel == PanelState.RightPanelState.ViewSettings)
-                {
-                    ExpandRightPropertyPanel(displaySettingsControl, Visibility.Visible);
-                }
-                else
-                {
-                    ExpandRightPropertyPanel(null, Visibility.Collapsed); 
-                }
-            }
-        }
-
-        #region Init PDFViewer
-
-        public void InitWithPDFViewer(CPDFViewer pdfViewer)
-        {
-            PdfViewControl.PDFView = pdfViewer;
-            PDFFormTool.InitWithPDFViewer(pdfViewer, FromPropertyControl);
-            FloatPageTool.InitWithPDFViewer(pdfViewer);
-            PDFGrid.Child = PdfViewControl;
-
-            panelState.PropertyChanged -= PanelState_PropertyChanged; 
-            panelState.PropertyChanged += PanelState_PropertyChanged; 
-        }
-
-        public void SetBOTAContainer(CPDFBOTABarControl botaControl)
-        {
-            this.BotaContainer.Child = botaControl;
-        }
         
-        public void SetDisplaySettingsControl(CPDFDisplaySettingsControl displaySettingsControl)
-        {
-            this.displaySettingsControl = displaySettingsControl;
-        }
-
-        public void ClearAllToolState()
-        {
-            this.PDFFormTool.ClearAllToolState();
-        }
-
-        public void SetToolBarContainerVisibility(Visibility visibility)
-        {
-            this.ToolBarContainer.Visibility = visibility;
-        }
-
-        #endregion
-
         #region Load Unload custom control
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
@@ -156,16 +98,6 @@ namespace Compdfkit_Tools.PDFControl
 
         #endregion
 
-        #region Form
-
-        public void SetViewSettings(Visibility visibility, CPDFDisplaySettingsControl displaySettingsControl = null)
-        {
-            this.PropertyContainer.Child = displaySettingsControl;
-            this.PropertyContainer.Visibility = visibility;
-        }
-
-        #endregion
-
         #region Expand and collapse Panel
 
         public void ExpandRightPropertyPanel(UIElement propertytPanel, Visibility visible)
@@ -193,7 +125,7 @@ namespace Compdfkit_Tools.PDFControl
 
         #endregion
 
-        #region Event handle
+        #region Private Command Method
         private void PDFView_WidgetClickHandler(object sender, WidgetArgs e)
         {
             if (e is WidgetSignArgs)
@@ -290,58 +222,7 @@ namespace Compdfkit_Tools.PDFControl
                 }
             }
         }
-        #endregion
-
-        public void InitialPDFViewControl(PDFViewControl newPDFViewer)
-        {
-            PDFFormTool.InitWithPDFViewer(newPDFViewer.PDFView, FromPropertyControl);
-            FromPropertyControl.SetPDFViewer(newPDFViewer.PDFView);
-            PDFFormTool.ClearAllToolState();
-            newPDFViewer.PDFView.AnnotEditHandler -= PDFView_AnnotEditHandler;
-            newPDFViewer.PDFView.AnnotActiveHandler -= PDFView_AnnotActiveHandler;
-            newPDFViewer.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
-            PdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
-            PdfViewControl.PDFView.UndoManager.PropertyChanged += UndoManager_PropertyChanged;
-            newPDFViewer.PDFView.AnnotEditHandler += PDFView_AnnotEditHandler;
-            newPDFViewer.PDFView.AnnotActiveHandler += PDFView_AnnotActiveHandler;
-            newPDFViewer.PDFView.WidgetClickHandler += PDFView_WidgetClickHandler;
-            newPDFViewer.CustomSignHandle = true;
-        }
-
-        public void UnloadEvent()
-        {
-            PdfViewControl.PDFView.AnnotEditHandler -= PDFView_AnnotEditHandler;
-            PdfViewControl.PDFView.AnnotActiveHandler -= PDFView_AnnotActiveHandler;
-            PdfViewControl.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
-            //panelState.PropertyChanged -= PanelState_PropertyChanged;
-        }
-
-        public void ClearViewerControl()
-        {
-            PDFGrid.Child = null;
-            BotaContainer.Child = null;
-            PropertyContainer.Child = null;
-            displaySettingsControl = null;
-        }
         
-        #region Property changed
-        protected void OnPropertyChanged([CallerMemberName] string name = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
-        }
-
-
-        public void UndoManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            OnPropertyChanged(e.PropertyName);
-            if (e.PropertyName == "CanSave")
-            {
-                OnCanSaveChanged?.Invoke(this, CanSave);
-            }
-        }
-
-        #endregion
-
         private void PDFView_AnnotCommandHandler(object sender, AnnotCommandArgs e)
         {
             if (e != null && e.CommandType == CommandType.Context)
@@ -548,5 +429,112 @@ namespace Compdfkit_Tools.PDFControl
                 PdfViewControl.PDFView.UndoManager?.Redo();
             }
         }
+        
+        protected void OnPropertyChanged([CallerMemberName] string name = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+        }
+
+        private void PanelState_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(PanelState.IsLeftPanelExpand))
+            {
+                ExpandLeftPanel(panelState.IsLeftPanelExpand);
+            }
+            else if (e.PropertyName == nameof(PanelState.RightPanel))
+            {
+                if (panelState.RightPanel == PanelState.RightPanelState.PropertyPanel)
+                {
+                    ExpandRightPropertyPanel(FromPropertyControl, Visibility.Visible);
+                }
+                else if (panelState.RightPanel == PanelState.RightPanelState.ViewSettings)
+                {
+                    ExpandRightPropertyPanel(displaySettingsControl, Visibility.Visible);
+                }
+                else
+                {
+                    ExpandRightPropertyPanel(null, Visibility.Collapsed); 
+                }
+            }
+        }
+        
+        private void UndoManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e.PropertyName);
+            if (e.PropertyName == "CanSave")
+            {
+                OnCanSaveChanged?.Invoke(this, CanSave);
+            }
+        }
+        #endregion
+
+        #region Public Method
+
+        public void InitWithPDFViewer(CPDFViewer pdfViewer)
+        {
+            PdfViewControl.PDFView = pdfViewer;
+            PDFFormTool.InitWithPDFViewer(pdfViewer, FromPropertyControl);
+            FloatPageTool.InitWithPDFViewer(pdfViewer);
+            PDFGrid.Child = PdfViewControl;
+
+            panelState.PropertyChanged -= PanelState_PropertyChanged; 
+            panelState.PropertyChanged += PanelState_PropertyChanged; 
+        }
+
+        public void SetBOTAContainer(CPDFBOTABarControl botaControl)
+        {
+            this.BotaContainer.Child = botaControl;
+        }
+        
+        public void SetDisplaySettingsControl(CPDFDisplaySettingsControl displaySettingsControl)
+        {
+            this.displaySettingsControl = displaySettingsControl;
+        }
+
+        public void ClearAllToolState()
+        {
+            this.PDFFormTool.ClearAllToolState();
+        }
+
+        public void SetToolBarContainerVisibility(Visibility visibility)
+        {
+            this.ToolBarContainer.Visibility = visibility;
+        }
+        
+        public void InitialPDFViewControl(PDFViewControl newPDFViewer)
+        {
+            PDFFormTool.InitWithPDFViewer(newPDFViewer.PDFView, FromPropertyControl);
+            FromPropertyControl.SetPDFViewer(newPDFViewer.PDFView);
+            PDFFormTool.ClearAllToolState();
+            newPDFViewer.PDFView.AnnotEditHandler -= PDFView_AnnotEditHandler;
+            newPDFViewer.PDFView.AnnotActiveHandler -= PDFView_AnnotActiveHandler;
+            newPDFViewer.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
+            PdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
+            PdfViewControl.PDFView.UndoManager.PropertyChanged += UndoManager_PropertyChanged;
+            newPDFViewer.PDFView.AnnotEditHandler += PDFView_AnnotEditHandler;
+            newPDFViewer.PDFView.AnnotActiveHandler += PDFView_AnnotActiveHandler;
+            newPDFViewer.PDFView.WidgetClickHandler += PDFView_WidgetClickHandler;
+            newPDFViewer.CustomSignHandle = true;
+        }
+
+        public void UnloadEvent()
+        {
+            PdfViewControl.PDFView.AnnotEditHandler -= PDFView_AnnotEditHandler;
+            PdfViewControl.PDFView.AnnotActiveHandler -= PDFView_AnnotActiveHandler;
+            PdfViewControl.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
+            //panelState.PropertyChanged -= PanelState_PropertyChanged;
+        }
+
+        public void ClearViewerControl()
+        {
+            PDFGrid.Child = null;
+            BotaContainer.Child = null;
+            PropertyContainer.Child = null;
+            displaySettingsControl = null;
+        }
+
+        #endregion
+
+        
     }
 }

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

@@ -20,12 +20,13 @@ namespace Compdfkit_Tools.PDFControl
 {
     public partial class PDFViewControl : UserControl
     {
+        #region Properties
         public CPDFViewer PDFView { get; set; }
 
         public bool CustomSignHandle { get; set; }
 
         private double[] zoomLevelList = { 1f, 8f, 12f, 25, 33f, 50, 66f, 75, 100, 125, 150, 200, 300, 400, 600, 800, 1000 };
-
+        #endregion
         public PDFViewControl()
         {
             InitializeComponent();
@@ -35,6 +36,7 @@ namespace Compdfkit_Tools.PDFControl
             PDFView.PDFActionHandler += PDFView_PDFActionHandler;
         }
 
+        #region Private Command Methods
         private void PDFView_PDFActionHandler(object sender, CPDFAction pdfAction)
         {
             if (pdfAction != null)
@@ -164,7 +166,9 @@ namespace Compdfkit_Tools.PDFControl
             }
             return standardZoom / 100;
         }
+        #endregion
 
+        #region Public Methods
         public bool CheckHasForm()
         {
             if (PDFView == null || PDFView.Document == null)
@@ -187,5 +191,7 @@ namespace Compdfkit_Tools.PDFControl
             }
             return false;
         }
+        #endregion
+        
     }
 }

Demo/Examples/Compdfkit_Tools/PageEdit/PageEditControl/PageEditControl.xaml.cs

@@ -18,6 +18,7 @@ namespace Compdfkit_Tools.PDFControl
 {
     public partial class PageEditControl : UserControl
     {
+        #region Properties
         private PDFViewControl _pdfViewControl;
         public PDFViewControl PDFViewControl
         {
@@ -39,7 +40,7 @@ namespace Compdfkit_Tools.PDFControl
         public event EventHandler OnAnnotEditHandler;
 
         private double[] zoomLevelList = { 1f, 8f, 12f, 25, 33f, 50, 66f, 75, 100, 125, 150, 200, 300, 400, 600, 800, 1000 };
-        
+        #endregion
         public PageEditControl()
         {
             InitializeComponent();
@@ -54,6 +55,7 @@ namespace Compdfkit_Tools.PDFControl
             pageEditControl.ExitPageEdit += PageEditControl_ExitPageEdit;
         }
 
+        #region Private Command Methods
         private void PageEditControl_ExitPageEdit(object sender, EventArgs e)
         {
             this.ExitPageEdit?.Invoke(this, EventArgs.Empty);
@@ -68,5 +70,6 @@ namespace Compdfkit_Tools.PDFControl
         {
            PageMoved?.Invoke(this, e);
         }
+        #endregion
     }
 }

Demo/Examples/DigitalSignature/MainWindow.xaml.cs

@@ -42,12 +42,7 @@ namespace DigitalSignature
         private SignatureStatusBarControl signatureStatusBarControl = new SignatureStatusBarControl();
         private PanelState panelState = PanelState.GetInstance();
         
-        public event EventHandler<bool> OnCanSaveChanged;
         public event PropertyChangedEventHandler PropertyChanged;
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
         
         #region Properties
 
@@ -583,6 +578,11 @@ namespace DigitalSignature
             }
         }
         
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+        
         #endregion
 
         #region Save file