comPDFKit(win) - 同步main，调整快捷键触发机制

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

@@ -6,7 +6,8 @@
              mc:Ignorable="d"
              xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl"
              xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common"
-             Loaded="MainWindow_Loaded"
+             Loaded="UserControl_Loaded"
+             Unloaded="UserControl_Unloaded"
              d:DesignHeight="720" d:DesignWidth="1080">
     <UserControl.Resources>
         <ResourceDictionary>

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

@@ -25,7 +25,17 @@ namespace Compdfkit_Tools.PDFControl
         private bool isFirstLoad = true;
         public PDFViewControl PdfViewControl = new PDFViewControl();
         public CPDFAnnotationControl PDFAnnotationControl = null;
-        public bool IsActive = false;
+        private bool _isActive = false;
+        public bool IsActive
+        {
+            get => _isActive; 
+            
+            set
+            {
+                _isActive = value;
+                OnPropertyChanged();
+            }
+        }
         private CPDFDisplaySettingsControl displaySettingsControl = null;
 
         private PanelState panelState = PanelState.GetInstance();
@@ -111,12 +121,11 @@ namespace Compdfkit_Tools.PDFControl
                 }
                 else if (panelState.RightPanel == PanelState.RightPanelState.ViewSettings)
                 {
-                    ExpandRightPropertyPanel((IsActive)?displaySettingsControl:null, Visibility.Visible);
+                    ExpandRightPropertyPanel((IsActive) ? displaySettingsControl : null, Visibility.Visible);
                 }
                 else
                 {
                     ExpandRightPropertyPanel(null, Visibility.Collapsed);
-
                 }
             }
         }
@@ -152,11 +161,18 @@ namespace Compdfkit_Tools.PDFControl
 
         #region Load Unload custom control
 
-        private void MainWindow_Loaded(object sender, RoutedEventArgs e)
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
             InitialPDFViewControl(PdfViewControl);
+            PdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler; 
         }
 
+        private void UserControl_Unloaded(object sender, RoutedEventArgs e)
+        {
+            PdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
+        }
+
+
         private void AnnotationBarControl_Loaded(object sender, RoutedEventArgs e)
         {
             AnnotationBarControl.AnnotationPropertyChanged += AnnotationBarControl_AnnotationPropertyChanged;
@@ -182,8 +198,6 @@ namespace Compdfkit_Tools.PDFControl
             ExpandRightPropertyPanel(null, Visibility.Collapsed);
             PDFAnnotationControl.ClearAnnotationBar -= PdfAnnotationControl_ClearAnnotationBar;
             PDFAnnotationControl.ClearAnnotationBar += PdfAnnotationControl_ClearAnnotationBar;
-            PdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
-            PdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
             PdfViewControl.PDFView.AnnotEditHandler -= PDFView_AnnotEditHandler;
             PdfViewControl.PDFView.AnnotEditHandler += PDFView_AnnotEditHandler;
             PdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
@@ -692,7 +706,7 @@ namespace Compdfkit_Tools.PDFControl
         {
             PDFGrid.Child = null;
             BotaContainer.Child = null;
-            PropertyContainer.Child= null;
+            PropertyContainer.Child = null;
         }
     }
 }

Demo/Examples/Compdfkit_Tools/Common/PropertyControl/PDFFont/CPDFFontUI.xaml.cs

@@ -157,7 +157,7 @@ namespace Compdfkit_Tools.Common
 
             List<string> fontStyleList = new List<string>()
             {
-                {"Common" },
+                {"Regular" },
                 {"Bold" },
                 {"Italic" },
                 {"Bold and Italic" }
@@ -200,7 +200,7 @@ namespace Compdfkit_Tools.Common
         private void FontStyleComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             FontStyleTextBox.Text = (sender as ComboBox).SelectedItem.ToString();
-            if (FontStyleTextBox.Text == "Common")
+            if (FontStyleTextBox.Text == "Regular")
             {
                 IsBold = false;
                 IsItalic = false;

Demo/Examples/Compdfkit_Tools/Edit/ContentEditCOntrol/ContentEditControl.xaml

@@ -8,7 +8,8 @@
              xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
-             Loaded="UserControl_Loaded">
+             Loaded="UserControl_Loaded"
+             Unloaded="UserControl_UnLoaded">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

Demo/Examples/Compdfkit_Tools/Edit/ContentEditCOntrol/ContentEditControl.xaml.cs

@@ -33,7 +33,17 @@ namespace Compdfkit_Tools.PDFControl
         #region Property
         public PDFViewControl PdfViewControl = new PDFViewControl();
         public PDFContentEditControl pdfContentEditControl = new PDFContentEditControl();
-        public bool IsActive = false;
+        private bool _isActive = false;
+        public bool IsActive
+        {
+            get => _isActive;
+
+            set
+            {
+                _isActive = value;
+                OnPropertyChanged(); 
+            }
+        }
 
         private double[] zoomLevelList = { 1f, 8f, 12f, 25, 33f, 50, 66f, 75, 100, 125, 150, 200, 300, 400, 600, 800, 1000 };
 
@@ -260,10 +270,14 @@ namespace Compdfkit_Tools.PDFControl
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-          
+            PdfViewControl.PDFView.PDFEditCommandHandler += PDFView_PDFEditCommandHandler;
         }
-         
 
+        private void UserControl_UnLoaded(object sender, RoutedEventArgs e)
+        {
+            PdfViewControl.PDFView.PDFEditCommandHandler -= PDFView_PDFEditCommandHandler;
+        }
+         
         public void ExpandRightPropertyPanel(UIElement propertytPanel, Visibility visible)
         {
             PropertyContainer.Width = 260;
@@ -279,8 +293,6 @@ namespace Compdfkit_Tools.PDFControl
             pdfContentEditControl.InitWithPDFViewer(pdfViewer);
             PdfViewControl.PDFView.PDFEditActiveHandler -= PDFView_PDFEditActiveHandler; 
             PdfViewControl.PDFView.PDFEditActiveHandler += PDFView_PDFEditActiveHandler;
-            PdfViewControl.PDFView.PDFEditCommandHandler -= PDFView_PDFEditCommandHandler;
-            PdfViewControl.PDFView.PDFEditCommandHandler += PDFView_PDFEditCommandHandler;
             PdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
             PdfViewControl.PDFView.UndoManager.PropertyChanged += UndoManager_PropertyChanged;
             DataContext = this;
@@ -575,5 +587,6 @@ namespace Compdfkit_Tools.PDFControl
         }
 
         #endregion
+
     }
 }

Demo/Examples/Compdfkit_Tools/Edit/PDFImageEdit/PDFImageEditControl/PDFImageEditControl.xaml.cs

@@ -235,7 +235,7 @@ namespace Compdfkit_Tools.Edit
         public void SetImageTransparency(double transparency)
         {
             ImasgeOpacitySlider.Value = transparency / 255D;
-            OpacityTextBox.Text = string.Format("{0}%", (int)(Math.Ceiling(ImasgeOpacitySlider.Value * 100)));
+            OpacityTextBox.Text = string.Format("{0}%", (int)(Math.Round(ImasgeOpacitySlider.Value * 100)));
         }
     }
 }

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

@@ -7,6 +7,7 @@
              xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl"
              xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common"
              Loaded="UserControl_Loaded"
+             Unloaded="UserControl_Unloaded"
              d:DesignHeight="720" d:DesignWidth="1080">
     <UserControl.Resources>
         <ResourceDictionary>

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

@@ -30,7 +30,17 @@ namespace Compdfkit_Tools.PDFControl
 
         public PDFViewControl PdfViewControl = new PDFViewControl();
         public FromPropertyControl FromPropertyControl = new FromPropertyControl();
-        public bool IsActive = false;
+        private bool _isActive = false;
+        public bool IsActive
+        {
+            get => _isActive;
+
+            set
+            {
+                _isActive = value;
+                OnPropertyChanged();
+            }
+        }
         private double[] zoomLevelList = { 1f, 8f, 12f, 25, 33f, 50, 66f, 75, 100, 125, 150, 200, 300, 400, 600, 800, 1000 };
         public event PropertyChangedEventHandler PropertyChanged;
         private CPDFDisplaySettingsControl displaySettingsControl;
@@ -146,9 +156,13 @@ namespace Compdfkit_Tools.PDFControl
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
             InitialPDFViewControl(PdfViewControl);
+            PdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
+        }
+         
+        private void UserControl_Unloaded(object sender, RoutedEventArgs e)
+        {
+            PdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
         }
-
-
 
         #endregion
 
@@ -297,10 +311,10 @@ namespace Compdfkit_Tools.PDFControl
             newPDFViewer.PDFView.AnnotEditHandler -= PDFView_AnnotEditHandler;
             newPDFViewer.PDFView.AnnotActiveHandler -= PDFView_AnnotActiveHandler;
             newPDFViewer.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
-            newPDFViewer.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
+           //newPDFViewer.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
             PdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
             PdfViewControl.PDFView.UndoManager.PropertyChanged += UndoManager_PropertyChanged;
-            newPDFViewer.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
+            //newPDFViewer.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
             newPDFViewer.PDFView.AnnotEditHandler += PDFView_AnnotEditHandler;
             newPDFViewer.PDFView.AnnotActiveHandler += PDFView_AnnotActiveHandler;
             newPDFViewer.PDFView.WidgetClickHandler += PDFView_WidgetClickHandler;

Demo/Examples/Compdfkit_Tools/PDFView/PDFThumbnail/PDFThumbnailUI/CPdfThumbnailUI.xaml

@@ -16,7 +16,7 @@
     </UserControl.Resources>
     <Grid>
         <ListBox Name="ThumbListBox" SelectionChanged="ThumbListBox_SelectionChanged" SelectionMode="Single" ScrollViewer.ScrollChanged="ThumbListBox_ScrollChanged" BorderThickness="0"
-                 ScrollViewer.VerticalScrollBarVisibility="Hidden">
+                 ScrollViewer.VerticalScrollBarVisibility="Auto">
             <ListBox.Resources>
                 <Style TargetType="ListBoxItem" BasedOn="{StaticResource ThumbnailListBoxItemStyle}"/>
             </ListBox.Resources>

Demo/Examples/Compdfkit_Tools/PDFView/RegularViewerControl.xaml

@@ -6,6 +6,8 @@
              xmlns:local="clr-namespace:Compdfkit_Tools.PDFView"
              xmlns:common="clr-namespace:Compdfkit_Tools.Common"
              mc:Ignorable="d"
+             Loaded="UserControl_Loaded"
+             Unloaded="UserControl_Unloaded"
              d:DesignHeight="720" d:DesignWidth="1080">
     <Grid>
         <Grid x:Name="BodyGrid">

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

@@ -5,6 +5,7 @@ using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -23,7 +24,17 @@ namespace Compdfkit_Tools.PDFView
         public CPDFAnnotationControl PDFAnnotationControl = new CPDFAnnotationControl();
         private CPDFDisplaySettingsControl displaySettingsControl = null;
         private PanelState panelState = PanelState.GetInstance();
-        public bool IsActive = false;
+        private bool _isActive = false;
+        public bool IsActive
+        {
+            get => _isActive;
+
+            set
+            {
+                _isActive = value;
+                OnPropertyChanged(); 
+            }
+        }
         private double[] zoomLevelList = { 1f, 8f, 12f, 25, 33f, 50, 66f, 75, 100, 125, 150, 200, 300, 400, 600, 800, 1000 };
         public event PropertyChangedEventHandler PropertyChanged;
         public event EventHandler<bool> OnCanSaveChanged;
@@ -101,9 +112,7 @@ namespace Compdfkit_Tools.PDFView
             PdfViewControl.PDFView?.SetMouseMode(MouseModes.Viewer);
             //PdfViewControl.PDFView?.Load();
             PdfViewControl.PDFView?.SetShowLink(true);
-            PDFGrid.Child = PdfViewControl;
-            PdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
-            PdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
+            PDFGrid.Child = PdfViewControl; 
             PdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
             PdfViewControl.PDFView.UndoManager.PropertyChanged += UndoManager_PropertyChanged;
             PdfViewControl.PDFView.SetFormFieldHighlight(true);
@@ -326,5 +335,17 @@ namespace Compdfkit_Tools.PDFView
         }
 
         #endregion
+
+        private async void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            await Task.Delay(TimeSpan.FromSeconds(10));
+            PdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
+        } 
+
+        private void UserControl_Unloaded(object sender, RoutedEventArgs e)
+        {
+            PdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
+
+        }
     }
 }

Demo/Examples/PDFViewer_new/App.xaml

@@ -1,7 +1,6 @@
 <Application x:Class="PDFViewer_new.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:PDFViewer_new"
               xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
              StartupUri="MainWindow.xaml">
     <Application.Resources>

Demo/Examples/PDFViewer_new/MainPage.xaml.cs

@@ -453,28 +453,6 @@ namespace PDFViewer_new
             botaBarControl.SelectBotaTool(BOTATools.Search);
         }
 
-        //private void ControlRightPanel()
-        //{
-        //    if (RightPanelButton != null)
-        //    {
-        //        if (RightPanelButton.IsChecked == true)
-        //        {
-        //            if (formControl.FromPropertyControl != null)
-        //            {
-        //                formControl.ExpandRightPropertyPanel(formControl.FromPropertyControl, Visibility.Visible);
-        //                if ((bool)ViewSettingBtn.IsChecked)
-        //                {
-        //                    ViewSettingBtn.IsChecked = false;
-        //                }
-        //            }
-        //        }
-        //        else
-        //        {
-        //            formControl.ExpandRightPropertyPanel(null, Visibility.Collapsed);
-        //        }
-        //    }
-        //}
-
         #region Save file
         /// <summary>
         /// Save the file to another PDF file.