compdfkit(win) - 应用注释作者

Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationData/CPDFAnnotationData.cs

@@ -156,7 +156,7 @@ namespace Compdfkit_Tools.Data
     {
         public CPDFAnnotationType AnnotationType;
         public string Note = string.Empty;
-        public string Author = "ComPDFKit";
+        public static string Author;
         public bool IsLocked = false;
     }
 

Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationPanel/PDFAnnotationControl/CPDFAnnotationControl.xaml.cs

@@ -214,7 +214,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as TextHighlightAnnotArgs).Color = highlightData.Color;
                     (annotHandlerEventArgs as TextHighlightAnnotArgs).Transparency = highlightData.Opacity;
                     (annotHandlerEventArgs as TextHighlightAnnotArgs).Content = highlightData.Note;
-                    (annotHandlerEventArgs as TextHighlightAnnotArgs).Author = highlightData.Author;
+                    (annotHandlerEventArgs as TextHighlightAnnotArgs).Author = CPDFAnnotationData.Author;
                     (annotHandlerEventArgs as TextHighlightAnnotArgs).Locked = highlightData.IsLocked;
                     break;
 
@@ -223,7 +223,7 @@ namespace Compdfkit_Tools.PDFControl
                     annotHandlerEventArgs = new TextUnderlineAnnotArgs();
                     (annotHandlerEventArgs as TextUnderlineAnnotArgs).Color = underlineData.Color;
                     (annotHandlerEventArgs as TextUnderlineAnnotArgs).Transparency = underlineData.Opacity;
-                    (annotHandlerEventArgs as TextUnderlineAnnotArgs).Author = underlineData.Author;
+                    (annotHandlerEventArgs as TextUnderlineAnnotArgs).Author = CPDFAnnotationData.Author;
                     (annotHandlerEventArgs as TextUnderlineAnnotArgs).Content = underlineData.Note;
                     (annotHandlerEventArgs as TextUnderlineAnnotArgs).Locked = underlineData.IsLocked;
                     break;
@@ -234,7 +234,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as TextStrikeoutAnnotArgs).Color = strikeoutData.Color;
                     (annotHandlerEventArgs as TextStrikeoutAnnotArgs).Transparency = strikeoutData.Opacity;
                     (annotHandlerEventArgs as TextStrikeoutAnnotArgs).Locked = strikeoutData.IsLocked;
-                    (annotHandlerEventArgs as TextStrikeoutAnnotArgs).Author = strikeoutData.Author;
+                    (annotHandlerEventArgs as TextStrikeoutAnnotArgs).Author = CPDFAnnotationData.Author;
                     (annotHandlerEventArgs as TextStrikeoutAnnotArgs).Content = strikeoutData.Note;
                     break;
 
@@ -244,7 +244,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as TextSquigglyAnnotArgs).Color = squigglyData.Color;
                     (annotHandlerEventArgs as TextSquigglyAnnotArgs).Transparency = squigglyData.Opacity;
                     (annotHandlerEventArgs as TextSquigglyAnnotArgs).Locked = squigglyData.IsLocked;
-                    (annotHandlerEventArgs as TextSquigglyAnnotArgs).Author = squigglyData.Author;
+                    (annotHandlerEventArgs as TextSquigglyAnnotArgs).Author = CPDFAnnotationData.Author;
                     (annotHandlerEventArgs as TextSquigglyAnnotArgs).Content = squigglyData.Note;
                     break;
 
@@ -256,7 +256,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as SquareAnnotArgs).LineWidth = squareData.Thickness;
                     (annotHandlerEventArgs as SquareAnnotArgs).Transparency = squareData.Opacity;
                     (annotHandlerEventArgs as SquareAnnotArgs).LineDash = squareData.DashStyle;
-                    (annotHandlerEventArgs as SquareAnnotArgs).Author = squareData.Author;
+                    (annotHandlerEventArgs as SquareAnnotArgs).Author = CPDFAnnotationData.Author;
                     (annotHandlerEventArgs as SquareAnnotArgs).Content = squareData.Note;
                     break;
 
@@ -268,7 +268,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as CircleAnnotArgs).LineWidth = cicleData.Thickness;
                     (annotHandlerEventArgs as CircleAnnotArgs).Transparency = cicleData.Opacity;
                     (annotHandlerEventArgs as CircleAnnotArgs).LineDash = cicleData.DashStyle;
-                    (annotHandlerEventArgs as CircleAnnotArgs).Author = cicleData.Author;
+                    (annotHandlerEventArgs as CircleAnnotArgs).Author = CPDFAnnotationData.Author;
                     (annotHandlerEventArgs as CircleAnnotArgs).Content = cicleData.Note;
                     break;
 
@@ -282,7 +282,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as LineAnnotArgs).LineDash = lineData.DashStyle;
                     (annotHandlerEventArgs as LineAnnotArgs).HeadLineType = lineData.LineType.HeadLineType;
                     (annotHandlerEventArgs as LineAnnotArgs).TailLineType = lineData.LineType.TailLineType;
-                    (annotHandlerEventArgs as LineAnnotArgs).Author = lineData.Author;
+                    (annotHandlerEventArgs as LineAnnotArgs).Author = CPDFAnnotationData.Author;
                     (annotHandlerEventArgs as LineAnnotArgs).Content = lineData.Note;
                     break;
 
@@ -292,7 +292,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as StickyAnnotArgs).Color = noteData.BorderColor;
                     (annotHandlerEventArgs as StickyAnnotArgs).StickyNote = noteData.Note;
                     (annotHandlerEventArgs as StickyAnnotArgs).Transparency = 1;
-                    (annotHandlerEventArgs as StickyAnnotArgs).Author = noteData.Author;
+                    (annotHandlerEventArgs as StickyAnnotArgs).Author = CPDFAnnotationData.Author;
                     break;
 
                 case CPDFAnnotationType.Freehand:
@@ -302,7 +302,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as FreehandAnnotArgs).LineWidth = freehandData.Thickness;
                     (annotHandlerEventArgs as FreehandAnnotArgs).Transparency = freehandData.Opacity;
                     (annotHandlerEventArgs as FreehandAnnotArgs).Content = freehandData.Note;
-                    (annotHandlerEventArgs as FreehandAnnotArgs).Author = freehandData.Author;
+                    (annotHandlerEventArgs as FreehandAnnotArgs).Author = CPDFAnnotationData.Author;
                     break;
 
                 case CPDFAnnotationType.FreeText:
@@ -316,7 +316,7 @@ namespace Compdfkit_Tools.PDFControl
                     (annotHandlerEventArgs as FreeTextAnnotArgs).FontSize = freeTextData.FontSize;
                     (annotHandlerEventArgs as FreeTextAnnotArgs).Align = freeTextData.TextAlignment;
                     (annotHandlerEventArgs as FreeTextAnnotArgs).Content = freeTextData.Note;
-                    (annotHandlerEventArgs as FreeTextAnnotArgs).Author = freeTextData.Author;
+                    (annotHandlerEventArgs as FreeTextAnnotArgs).Author = CPDFAnnotationData.Author;
                     break;
 
                 case CPDFAnnotationType.Stamp:
@@ -396,7 +396,7 @@ namespace Compdfkit_Tools.PDFControl
         private void SetStamp(ref StampAnnotArgs Args, CPDFStampData stamp)
         {
             Args.StampText = stamp.StampText;
-            Args.Author = stamp.Author;
+            Args.Author = CPDFAnnotationData.Author;
             Args.Opacity = stamp.Opacity;
             if (stamp.Type == StampType.IMAGE_STAMP)
             {
@@ -461,7 +461,7 @@ namespace Compdfkit_Tools.PDFControl
                     freehandArgs.LineWidth = freehandData.Thickness;
                     freehandArgs.Transparency = freehandData.Opacity;
                     freehandArgs.Content = freehandData.Note;
-                    freehandArgs.Author = freehandData.Author;
+                    freehandArgs.Author = CPDFAnnotationData.Author;
                 }
             }
         }

Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationPanel/PDFAnnotationUI/CPDFStampUI.xaml.cs

@@ -132,7 +132,6 @@ namespace Compdfkit_Tools.Annotation.PDFAnnotationPanel.PDFAnnotationUI
             for (int i = 0; i < Path.Count; i++)
             {
                 CPDFStampData standardStamp = new CPDFStampData();
-                standardStamp.Author = "";
                 standardStamp.Opacity = 1;
                 standardStamp.SourcePath = Path[i];
                 standardStamp.StampText = StampText[i];
@@ -157,7 +156,6 @@ namespace Compdfkit_Tools.Annotation.PDFAnnotationPanel.PDFAnnotationUI
                 {
                     CPDFStampData customStamp = new CPDFStampData();
                     customStamp.Opacity = 1;
-                    customStamp.Author = stamps[i].Author;
                     customStamp.StampText = stamps[i].StampText;
                     customStamp.StampTextDate = stamps[i].StampTextDate;
                     customStamp.MaxWidth = stamps[i].MaxWidth;

Demo/Examples/Compdfkit_Tools/Common/BarControl/CPDFTitleBarControl.xaml

@@ -30,7 +30,7 @@
                     <MenuItem Header="Help" Style="{StaticResource Dropdown_MenuItem}">
                         <MenuItem Header="About Us" Style="{StaticResource Sub_MenuItem}" Click="AboutUsItem_Click"></MenuItem>
                         <MenuItem Header="Contact Us" Style="{StaticResource Sub_MenuItem}" Click="ContactUs_Click"></MenuItem>
-                        <MenuItem Header="Privacy Agreement" Style="{StaticResource Sub_MenuItem}" Click="PrivacyAgreement_Click"></MenuItem>
+                        <MenuItem Header="Privacy Policy" Style="{StaticResource Sub_MenuItem}" Click="PrivacyAgreement_Click"></MenuItem>
                         <MenuItem Header="Service Terms" Style="{StaticResource Sub_MenuItem}" Click="ServiceTerms_Click"></MenuItem>
                         <MenuItem Header="Developer Device ID" Style="{StaticResource Sub_MenuItem}" Click="DeviceSerial_Click"></MenuItem>
                     </MenuItem>

Demo/Examples/Compdfkit_Tools/PDFView/PDFBookmark/PDFBookmarkControl/CPDFBookmarkControl.xaml.cs

@@ -20,11 +20,11 @@ namespace Compdfkit_Tools.PDFControl
         {
             InitializeComponent();
             Loaded += CPDFBookmarkControl_Loaded;
+            Unloaded += CPDFBookmarkControl_Unloaded;
         }
 
         private void CPDFBookmarkControl_Loaded(object sender, RoutedEventArgs e)
         {
-            BookmarkAddUI.BookmarkAddEvent -= BookmarkAddUI_BookmarkAddEvent;
             BookmarkAddUI.BookmarkAddEvent += BookmarkAddUI_BookmarkAddEvent;
             BookmarkAddUI.BookmarkInputExpandEvent += BookmarkAddUI_BookmarkInputExpandEvent;
             BookmarkResultUI.SelectionChanged += BookmarkResultUI_SelectionChanged;
@@ -32,6 +32,16 @@ namespace Compdfkit_Tools.PDFControl
             BookmarkResultUI.BookmarkClicked += BookmarkResultUI_BookmarkClicked;
             BookmarkResultUI.BookmarkEdit += BookmarkResultUI_BookmarkEdit;
         }
+        
+        private void CPDFBookmarkControl_Unloaded(object sender, RoutedEventArgs e)
+        {
+            BookmarkAddUI.BookmarkAddEvent -= BookmarkAddUI_BookmarkAddEvent;
+            BookmarkAddUI.BookmarkInputExpandEvent -= BookmarkAddUI_BookmarkInputExpandEvent;
+            BookmarkResultUI.SelectionChanged -= BookmarkResultUI_SelectionChanged;
+            BookmarkResultUI.BookmarkDelete -= BookmarkResultUI_BookmarkDelete;
+            BookmarkResultUI.BookmarkClicked -= BookmarkResultUI_BookmarkClicked;
+            BookmarkResultUI.BookmarkEdit -= BookmarkResultUI_BookmarkEdit;
+        }
 
         private void BookmarkResultUI_BookmarkEdit(object sender, BookmarkChangeData e)
         {

Demo/Examples/PDFViewer/MainWindow.xaml

@@ -13,7 +13,7 @@
         xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
         xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
         BorderThickness="{Binding RelativeSource={RelativeSource Mode=Self},Path=WindowState,Converter={StaticResource WindowStateToThicknessConverter}}"
-        Title="ComPDFKit V1.10.0" Height="720" Width="1200" MinWidth="780">
+        Title="ComPDFKit V1.11.0" Height="720" Width="1200" MinWidth="780">
 
     <Window.Resources>
         <cpdfcommon:HomePageHeightConverter x:Key="HomePageHeightConverter"></cpdfcommon:HomePageHeightConverter>

Demo/Examples/PDFViewer/MainWindow.xaml.cs

@@ -20,6 +20,7 @@ using Dragablz;
 using Compdfkit_Tools.Helper;
 using System.Windows.Controls.Primitives;
 using Compdfkit_Tools.Common;
+using Compdfkit_Tools.Data;
 using ComPDFKit.PDFDocument;
 
 namespace PDFViewer
@@ -55,6 +56,7 @@ namespace PDFViewer
             TabControl.SelectionChanged -= TabControl_SelectionChanged;
             TabControl.SelectionChanged += TabControl_SelectionChanged;
             FirstLoadFile();
+            CPDFAnnotationData.Author = Properties.Settings.Default.DocumentAuthor;
         }
 
         private void FirstLoadFile()

Demo/Examples/PDFViewer/SettingsDialog.xaml.cs

@@ -21,6 +21,7 @@ namespace PDFViewer
         private void MainWindow_Closing(object sender, CancelEventArgs e)
         {
             Properties.Settings.Default.Save();
+            Compdfkit_Tools.Data.CPDFAnnotationData.Author = Properties.Settings.Default.DocumentAuthor;
         }
 
         private void EventSetter_ClickHandler(object sender, RoutedEventArgs e)