【2025】【综合】更新SDK

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFCircleAnnotation+PDFListView.swift

@@ -17,25 +17,10 @@ import Foundation
         
         self.border = CPDFCircleAnnotation.defaultBorder()
         
-        if true {
-            let resultColor = CPDFCircleAnnotation.defaultColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.color = nil
-            } else {
-                self.color = resultColor
-            }
-        }
+        self.color = CPDFCircleAnnotation.defaultColor()
+        
+        self.interiorColor = CPDFCircleAnnotation.defaultInteriorColor()
         
-        if true {
-            let resultColor = CPDFCircleAnnotation.defaultInteriorColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.interiorColor = nil
-            } else {
-                self.interiorColor = resultColor
-            }
-        }
     }
     
     class func annotationImage(annotationModel: CPDFAnnotationModel) -> NSImage {
@@ -234,13 +219,8 @@ extension CPDFCircleAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.color = nil
-            } else {
-                annotation.color = resultColor
-            }
+            annotation.color = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
@@ -255,13 +235,8 @@ extension CPDFCircleAnnotation {
             return
         }
         
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.interiorColor = nil
-            } else {
-                annotation.interiorColor = resultColor
-            }
+            annotation.interiorColor = resultColor
         }
         
         pdfView.setNeedsDisplayMultiAnnotations(annotations)

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFFreeTextAnnotation+PDFListView.swift

@@ -15,35 +15,11 @@ import Foundation
         self.fontSize = CPDFFreeTextAnnotation.defaultFontSize()
         self.alignment = CPDFFreeTextAnnotation.defaultFontAlignment()
         
-        if true {
-            let resultColor = CPDFFreeTextAnnotation.defaultFontColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.fontColor = nil
-            } else {
-                self.fontColor = resultColor
-            }
-        }
+        self.fontColor = CPDFFreeTextAnnotation.defaultFontColor()
         
-        if true {
-            let resultColor = CPDFFreeTextAnnotation.defaultColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.color = nil
-            } else {
-                self.color = resultColor
-            }
-        }
+        self.color = CPDFFreeTextAnnotation.defaultColor()
         
-        if true {
-            let resultColor = CPDFFreeTextAnnotation.defaultBorderColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.borderColor = nil
-            } else {
-                self.borderColor = resultColor
-            }
-        }
+        self.borderColor = CPDFFreeTextAnnotation.defaultBorderColor()
         
         self.opacity = CPDFFreeTextAnnotation.defaultOpacity()
         
@@ -260,7 +236,7 @@ extension CPDFFreeTextAnnotation {
         return .left
     }
     
-    class func defaultFontColor() -> NSColor {        
+    class func defaultFontColor() -> NSColor {
         if let color =  CPDFAnnotationConfig.getDefaultColor(forKey: CFreeTextNoteFontColorKey) {
             return color
         }
@@ -365,13 +341,8 @@ extension CPDFFreeTextAnnotation {
             return
         }
         
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.color = nil
-            } else {
-                annotation.color = resultColor
-            }
+            annotation.color = resultColor
         }
         
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
@@ -386,13 +357,8 @@ extension CPDFFreeTextAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.fontColor = nil
-            } else {
-                annotation.fontColor = resultColor
-            }
+            annotation.fontColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
@@ -419,13 +385,8 @@ extension CPDFFreeTextAnnotation {
             return
         }
         
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.borderColor = NSColor.clear
-            } else {
-                annotation.borderColor = resultColor
-            }
+            annotation.borderColor = resultColor
         }
         
         pdfView.setNeedsDisplayMultiAnnotations(annotations)

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFSquareAnnotation+PDFListView.swift

@@ -17,25 +17,10 @@ import Foundation
         
         self.border = CPDFSquareAnnotation.defaultBorder()
         
-        if true {
-            let resultColor = CPDFSquareAnnotation.defaultColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.color = nil
-            } else {
-                self.color = resultColor
-            }
-        }
+        self.color = CPDFSquareAnnotation.defaultColor()
+        
+        self.interiorColor = CPDFSquareAnnotation.defaultInteriorColor()
         
-        if true {
-            let resultColor = CPDFSquareAnnotation.defaultInteriorColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.interiorColor = nil
-            } else {
-                self.interiorColor = resultColor
-            }
-        }
     }
     
     class func annotationImage(annotationModel: CPDFAnnotationModel) -> NSImage {
@@ -227,13 +212,8 @@ extension CPDFSquareAnnotation {
             return
         }
         
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.interiorColor = nil
-            } else {
-                annotation.interiorColor = resultColor
-            }
+            annotation.interiorColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Fill/CSelfSignAnnotation+PDFListView.swift

@@ -81,15 +81,9 @@ extension CSelfSignAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        
-        let opacity = resultColor.getAlphaComponent()
+         
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.lineColor = nil
-            } else {
-                annotation.lineColor = resultColor
-            }
-            
+            annotation.lineColor = resultColor
             if annotation.annotationType == .signTure {
                 CPDFAnnotationConfig.setDefaultColor(resultColor, toKey: CAnnotationSelfSignTureColorKey)
             } else if annotation.annotationType == .signFalse {

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Fill/CSelfSignAnnotationFreeText+PDFListView.swift

@@ -164,13 +164,8 @@ extension CSelfSignAnnotationFreeText {
             return
         }
         
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.color = nil
-            } else {
-                annotation.color = resultColor
-            }
+            annotation.color = resultColor
         }
         
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
@@ -185,19 +180,14 @@ extension CSelfSignAnnotationFreeText {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.fontColor = nil
-            } else {
-                annotation.fontColor = resultColor
-            }
+            annotation.fontColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
         CPDFAnnotationConfig.setDefaultColor(resultColor, toKey: CAnnotationSelfSignDate_FontColor_Key)
     }
-       
+    
     class func update_SelfSign_Opacity(_ annotations: [CSelfSignAnnotationFreeText], _ opacity: CGFloat, withPDFView pdfView: CPDFListView?) {
         guard let pdfView = pdfView else {
             return

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFButtonWidgetAnnotation+PDFListView.swift

@@ -271,17 +271,11 @@ extension CPDFButtonWidgetAnnotation {
             return
         }
         
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.fontColor = nil
-            } else {
-                annotation.fontColor = resultColor
-            }
+            annotation.fontColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
-        
-        
+         
     }
     
     class func update(_ annotations: [CPDFButtonWidgetAnnotation], borderColor color: NSColor?, PDFView pdfView: CPDFListView?) {
@@ -291,13 +285,8 @@ extension CPDFButtonWidgetAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.borderColor = nil
-            } else {
-                annotation.borderColor = resultColor
-            }
+            annotation.borderColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
@@ -310,13 +299,8 @@ extension CPDFButtonWidgetAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.backgroundColor = nil
-            } else {
-                annotation.backgroundColor = resultColor
-            }
+            annotation.backgroundColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFChoiceWidgetAnnotation+PDFListView.swift

@@ -62,7 +62,7 @@ import Foundation
 
 //MARK: - DefaultInfo
 extension CPDFChoiceWidgetAnnotation {
-     
+    
     class func defaultTextColor(isListChoice: Bool) -> NSColor {
         if isListChoice {
             return CPDFAnnotationConfig.getDefaultColor(forKey: CAnnotationChoiceListWidgetFontColorKey) ?? NSColor(red: 0, green: 0, blue: 0, alpha: 1)
@@ -166,7 +166,7 @@ extension CPDFChoiceWidgetAnnotation {
             return
         }
         for annotation in annotations {
-//            annotation.setExportValue(resultValue)
+            //            annotation.setExportValue(resultValue)
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
     }
@@ -179,13 +179,8 @@ extension CPDFChoiceWidgetAnnotation {
             return
         }
         
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.fontColor = nil
-            } else {
-                annotation.fontColor = resultColor
-            }
+            annotation.fontColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
@@ -199,13 +194,8 @@ extension CPDFChoiceWidgetAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.borderColor = nil
-            } else {
-                annotation.borderColor = resultColor
-            }
+            annotation.borderColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
@@ -218,13 +208,8 @@ extension CPDFChoiceWidgetAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.backgroundColor = nil
-            } else {
-                annotation.backgroundColor = resultColor
-            }
+            annotation.backgroundColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFTextWidgetAnnotation+PDFListView.swift

@@ -17,35 +17,11 @@ import Foundation
         
         self.cFont = CPDFTextWidgetAnnotation.defaultFont()
         
-        if true {
-            let resultColor = CPDFTextWidgetAnnotation.defaultTextColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.fontColor = nil
-            } else {
-                self.fontColor = resultColor
-            }
-        }
+        self.fontColor = CPDFTextWidgetAnnotation.defaultTextColor()
         
-        if true {
-            let resultColor = CPDFTextWidgetAnnotation.defaultBorderColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.borderColor = nil
-            } else {
-                self.borderColor = resultColor
-            }
-        }
+        self.borderColor = CPDFTextWidgetAnnotation.defaultBorderColor()
         
-        if true {
-            let resultColor = CPDFTextWidgetAnnotation.defaultFillColor()
-            let opacity = resultColor.getAlphaComponent()
-            if opacity < 0.01 {
-                self.backgroundColor = nil
-            } else {
-                self.backgroundColor = resultColor
-            }
-        }
+        self.backgroundColor = CPDFTextWidgetAnnotation.defaultFillColor()
         
         self.alignment = CPDFTextWidgetAnnotation.defaultFontAlignment()
         self.backgroundOpacity = 1
@@ -181,13 +157,8 @@ extension CPDFTextWidgetAnnotation {
             return
         }
         
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.fontColor = nil
-            } else {
-                annotation.fontColor = resultColor
-            }
+            annotation.fontColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
@@ -202,13 +173,9 @@ extension CPDFTextWidgetAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
+        
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.borderColor = nil
-            } else {
-                annotation.borderColor = resultColor
-            }
+            annotation.borderColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
@@ -222,13 +189,8 @@ extension CPDFTextWidgetAnnotation {
         guard let pdfView = pdfView else {
             return
         }
-        let opacity = resultColor.getAlphaComponent()
         for annotation in annotations {
-            if opacity < 0.01 {
-                annotation.backgroundColor = nil
-            } else {
-                annotation.backgroundColor = resultColor
-            }
+            annotation.backgroundColor = resultColor
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         

PDF Office/PDF Master/Class/PDFWindowController/PDFSDK/ComPDFKit.framework/Versions/A/Headers/CPDFKitConfig.h

@@ -86,6 +86,14 @@
  * Set whether to allow to highlight form field in the CPDFView.
  */
 - (void)setEnableFormFieldHighlight:(BOOL)enableFormFieldHighlight;
+/**
+ * Get whether to allow to freetextAnnotation autoresizingmask width in the CPDFView.
+ */
+- (BOOL)enableFreeTextAnnotationAutoresizingMaskWidth;
+/**
+ * Set whether to allow to freetextAnnotation autoresizingmask width in the CPDFView.
+ */
+- (void)setEnableFreeTextAnnotationAutoresizingMaskWidth:(BOOL)enableFreeTextAnnotationAutoresizingMaskWidth;
 /**
  * Get whether to allow annotation rotation.
  */

PDF Office/PDF Master/Class/PDFWindowController/PDFSDK/ComPDFKit.framework/Versions/A/Modules/module.modulemap

@@ -1,6 +1,6 @@
 framework module ComPDFKit {
   umbrella header "ComPDFKit.h"
-  export *
 
+  export *
   module * { export * }
 }

PDF Office/PDF Master/Class/PDFWindowController/PDFSDK/ComPDFKit.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>23A344</string>
+	<string>21E230</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -27,19 +27,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string></string>
+	<string>13A233</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>14.2</string>
+	<string>11.3</string>
 	<key>DTSDKBuild</key>
-	<string>23C53</string>
+	<string>20E214</string>
 	<key>DTSDKName</key>
-	<string>macosx14.2</string>
+	<string>macosx11.3</string>
 	<key>DTXcode</key>
-	<string>1520</string>
+	<string>1300</string>
 	<key>DTXcodeBuild</key>
-	<string>15C500b</string>
+	<string>13A233</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.11</string>
 </dict>

PDF Office/PDF Master/Class/PDFWindowController/PDFSDK/ComPDFKit.framework/Versions/A/_CodeSignature/CodeResources

@@ -6,15 +6,15 @@
 	<dict>
 		<key>Resources/Assets.car</key>
 		<data>
-		UlWbqdfXO52si+nmlS2gVgXXEN4=
+		Lsv7/Q81njxGwXBA8bI9Dpf4F1w=
 		</data>
 		<key>Resources/CPDFUnlockViewController.nib/keyedobjects-101300.nib</key>
 		<data>
-		WWbJH/mkNN2q0uLETXjvlNRlcAQ=
+		e/XSIlGXrK/XQ3MPSq17IjdvEEo=
 		</data>
 		<key>Resources/CPDFUnlockViewController.nib/keyedobjects.nib</key>
 		<data>
-		dRWDU96uUk0Hy6R6fw3WiuV5+Tc=
+		Dv5ax23hZ/GohlG6yLpCpgKtmBE=
 		</data>
 		<key>Resources/Cert/0d264c89.0</key>
 		<data>
@@ -46,11 +46,11 @@
 		</data>
 		<key>Resources/Info.plist</key>
 		<data>
-		s+LRDesmHHues519KQPS6Fgg3IA=
+		Hoq1bHhFMnOVJoMAfRXpu6wD6fY=
 		</data>
 		<key>Resources/default.metallib</key>
 		<data>
-		PWgVqT4CtBAWiJxWMT4peo9xRa4=
+		OW1waXyR5Kz59kYzU5PENdarCTU=
 		</data>
 		<key>Resources/empty_password.png</key>
 		<data>
@@ -581,11 +581,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			OxEfUUaAJW5+1NQlhKPDDr3d0xI=
+			5aEFrZyhcwmo51DnI/t/uNCOTVk=
 			</data>
 			<key>hash2</key>
 			<data>
-			B76IoMNcQSB8gKiVEFjSpGqAOLCjqxajfLqTCs+VP8g=
+			0bcidtW9nEUwLuHtpsGacEKSS6LKMS4xvFnHn8hPvy4=
 			</data>
 		</dict>
 		<key>Headers/CPDFKitPlatform.h</key>
@@ -1131,44 +1131,44 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			GJse0j0x4wLzigM/YeAjcM+nZxQ=
+			LiQoiZ0HQqg8PLvhYGe2l6sUM/Q=
 			</data>
 			<key>hash2</key>
 			<data>
-			iQcHR0nTiFjwgQN3izRKSCofKuNTCmNsv4iXpEARTgc=
+			AAkcPQ+8lTvgjXGHEKzmPSMjAW0mw1D0ReUK5G9YEwQ=
 			</data>
 		</dict>
 		<key>Resources/Assets.car</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			UlWbqdfXO52si+nmlS2gVgXXEN4=
+			Lsv7/Q81njxGwXBA8bI9Dpf4F1w=
 			</data>
 			<key>hash2</key>
 			<data>
-			DzpiBgAOKtgBBasPN6omeqK0Twl09xqBD3H0phK1HcU=
+			PHXwNJNPYSsfT1XIPEdwX2PrSmexDOCEb4tCnkhHshk=
 			</data>
 		</dict>
 		<key>Resources/CPDFUnlockViewController.nib/keyedobjects-101300.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			WWbJH/mkNN2q0uLETXjvlNRlcAQ=
+			e/XSIlGXrK/XQ3MPSq17IjdvEEo=
 			</data>
 			<key>hash2</key>
 			<data>
-			VhdkFTWYOUDHoZdvkZgwIgVNDt8Vj7h0sUxpPKvyjGw=
+			Cci8sTloeOT1JTL92WrgtxN/YiPEzExX+pbP8X68m+Q=
 			</data>
 		</dict>
 		<key>Resources/CPDFUnlockViewController.nib/keyedobjects.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			dRWDU96uUk0Hy6R6fw3WiuV5+Tc=
+			Dv5ax23hZ/GohlG6yLpCpgKtmBE=
 			</data>
 			<key>hash2</key>
 			<data>
-			8puPkEjA9zB7vITJGCll+ZMXd+s8tKMT/p5YgHr/z3g=
+			u30610+slEfn4T8al/uF0uaEk6zWaMgecsgOru7puII=
 			</data>
 		</dict>
 		<key>Resources/Cert/0d264c89.0</key>
@@ -1252,22 +1252,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			s+LRDesmHHues519KQPS6Fgg3IA=
+			Hoq1bHhFMnOVJoMAfRXpu6wD6fY=
 			</data>
 			<key>hash2</key>
 			<data>
-			C/NHla1BfoG+h822rED/X0su48pTBnbGMH5Sv9DJftM=
+			BdRjiKJrHT45/uoFJgLCbbEa2fI7njv5yVbGEohAhqY=
 			</data>
 		</dict>
 		<key>Resources/default.metallib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			PWgVqT4CtBAWiJxWMT4peo9xRa4=
+			OW1waXyR5Kz59kYzU5PENdarCTU=
 			</data>
 			<key>hash2</key>
 			<data>
-			c9ASF45+FqyvK6yt+pau86rzg7KJekcYdRY7lglPRs4=
+			IWxLuwqEZ9Pnv1OTOt5tixhIqu82+kdo59Ff6hmjuaM=
 			</data>
 		</dict>
 		<key>Resources/empty_password.png</key>

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Highlight/KMHighlightController.swift

@@ -136,17 +136,17 @@ class KMHighlightController: NSViewController {
             var opacity: CGFloat = 0
             
             if viewManager?.subToolMode == .Highlight {
-                curColor = CPDFAnnotationConfig.standard.colorWithType(.highlight) ?? .clear
-                opacity = CPDFAnnotationConfig.standard.opacityWithType(.highlight)
+                curColor = CPDFMarkupAnnotation.defaultColor(.highlight)
+                opacity = CPDFMarkupAnnotation.defaultOpacity(.highlight)
             } else if viewManager?.subToolMode == .Underline {
-                curColor = CPDFAnnotationConfig.standard.colorWithType(.underline) ?? .clear
-                opacity = CPDFAnnotationConfig.standard.opacityWithType(.underline)
+                curColor = CPDFMarkupAnnotation.defaultColor(.underline)
+                opacity = CPDFMarkupAnnotation.defaultOpacity(.underline)
             } else if viewManager?.subToolMode == .Waveline {
-                curColor = CPDFAnnotationConfig.standard.colorWithType(.squiggly) ?? .clear
-                opacity = CPDFAnnotationConfig.standard.opacityWithType(.squiggly)
+                curColor = CPDFMarkupAnnotation.defaultColor(.squiggly)
+                opacity = CPDFMarkupAnnotation.defaultOpacity(.squiggly)
             } else if viewManager?.subToolMode == .Strikethrough {
-                curColor = CPDFAnnotationConfig.standard.colorWithType(.strikeOut) ?? .clear
-                opacity = CPDFAnnotationConfig.standard.opacityWithType(.strikeOut)
+                curColor = CPDFMarkupAnnotation.defaultColor(.strikeOut)
+                opacity = CPDFMarkupAnnotation.defaultOpacity(.strikeOut)
             }
             
             colorGroup.currentColor = curColor

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Note/KMNoteController.swift

@@ -82,7 +82,7 @@ class KMNoteController: NSViewController {
         }
         
         if true {
-            var colors: [NSColor] = KMAnnotationPropertiesColorManager.manager.noteColors
+            let colors: [NSColor] = KMAnnotationPropertiesColorManager.manager.noteColors
             if colors.count > 4 {
                 let colorAProperty = ComponentCColorProperty(colorType: .color, state: .normal, isCustom: false, color: colors[0])
                 let colorBProperty = ComponentCColorProperty(colorType: .color, state: .normal, isCustom: false, color: colors[1])

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3158,54 +3158,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4342"
-            endingLineNumber = "4342"
-            landmarkName = "viewWillLayoutFunction()"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 857c2215f9e52b9b"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.addAdsBannerView() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4343"
-                  endingLineNumber = "4343"
-                  offsetFromSymbolStart = "1640">
-               </Location>
-               <Location
-                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 2bef25cf46ed3959"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.viewWillLayoutFunction() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4342"
-                  endingLineNumber = "4342"
-                  offsetFromSymbolStart = "1516">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -3218,7 +3170,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "4674"
             endingLineNumber = "4674"
-            landmarkName = "showAITypeChooseView(aiConfigType:)"
+            landmarkName = "loadOpenFileFunctionGuide(_:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -3251,6 +3203,21 @@
                   endingLineNumber = "4674"
                   offsetFromSymbolStart = "1080">
                </Location>
+               <Location
+                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - 35a8d536a00dd08b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.loadOpenFileFunctionGuide(PDF_Reader_Pro.KMGuideInfoType) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4675"
+                  endingLineNumber = "4675"
+                  offsetFromSymbolStart = "5920">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4508,6 +4475,21 @@
                   endingLineNumber = "1635"
                   offsetFromSymbolStart = "56">
                </Location>
+               <Location
+                  uuid = "A6622DB8-F4DC-4C79-84DE-00DB0AAE8ED8 - 4efd6f66d87a63b8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFAnnotationModel interiorColor]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1634"
+                  endingLineNumber = "1634"
+                  offsetFromSymbolStart = "56">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4795,7 +4777,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "229"
             endingLineNumber = "229"
-            landmarkName = "mouseDown(with:)"
+            landmarkName = "updateDefaultInfo(_:_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -5334,58 +5316,28 @@
             filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFButtonWidgetAnnotation+PDFListView.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "339"
-            endingLineNumber = "339"
+            startingLineNumber = "323"
+            endingLineNumber = "323"
             landmarkName = "updateFont(_:_:withPDFView:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "11C6CF63-E4D0-44C0-BFD5-06C18F69F08E - cb60ba49c74c652"
+                  uuid = "11C6CF63-E4D0-44C0-BFD5-06C18F69F08E - 90298a66d0fe4c2b"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "static __C.CPDFButtonWidgetAnnotation.updateFont(_: Swift.Array&lt;__C.CPDFButtonWidgetAnnotation&gt;, _: __C.CPDFFont, withPDFView: Swift.Optional&lt;__C.CPDFListView&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFButtonWidgetAnnotation+PDFListView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "339"
-                  endingLineNumber = "339"
-                  offsetFromSymbolStart = "172">
-               </Location>
-               <Location
-                  uuid = "11C6CF63-E4D0-44C0-BFD5-06C18F69F08E - cb60ba49c74c652"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "static __C.CPDFButtonWidgetAnnotation.updateFont(_: Swift.Array&lt;__C.CPDFButtonWidgetAnnotation&gt;, _: __C.CPDFFont, withPDFView: Swift.Optional&lt;__C.CPDFListView&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFButtonWidgetAnnotation+PDFListView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "339"
-                  endingLineNumber = "339"
-                  offsetFromSymbolStart = "300">
-               </Location>
-               <Location
-                  uuid = "11C6CF63-E4D0-44C0-BFD5-06C18F69F08E - cb60ba49c74c652"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "static __C.CPDFButtonWidgetAnnotation.updateFont(_: Swift.Array&lt;__C.CPDFButtonWidgetAnnotation&gt;, _: __C.CPDFFont, withPDFView: Swift.Optional&lt;__C.CPDFListView&gt;) -&gt; ()"
+                  symbolName = "static __C.CPDFButtonWidgetAnnotation.update(_: Swift.Array&lt;__C.CPDFButtonWidgetAnnotation&gt;, fillColor: Swift.Optional&lt;__C.NSColor&gt;, PDFView: Swift.Optional&lt;__C.CPDFListView&gt;) -&gt; ()"
                   moduleName = "PDF Reader Pro"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFButtonWidgetAnnotation+PDFListView.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "339"
-                  endingLineNumber = "339"
-                  offsetFromSymbolStart = "316">
+                  startingLineNumber = "323"
+                  endingLineNumber = "323"
+                  offsetFromSymbolStart = "680">
                </Location>
                <Location
-                  uuid = "11C6CF63-E4D0-44C0-BFD5-06C18F69F08E - cb60ba49c74c673"
+                  uuid = "11C6CF63-E4D0-44C0-BFD5-06C18F69F08E - cb60ba49c74c443"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -5395,12 +5347,12 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFButtonWidgetAnnotation+PDFListView.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "340"
-                  endingLineNumber = "340"
+                  startingLineNumber = "324"
+                  endingLineNumber = "324"
                   offsetFromSymbolStart = "172">
                </Location>
                <Location
-                  uuid = "11C6CF63-E4D0-44C0-BFD5-06C18F69F08E - cb60ba49c74c673"
+                  uuid = "11C6CF63-E4D0-44C0-BFD5-06C18F69F08E - cb60ba49c74c443"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -5410,8 +5362,8 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFButtonWidgetAnnotation+PDFListView.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "340"
-                  endingLineNumber = "340"
+                  startingLineNumber = "324"
+                  endingLineNumber = "324"
                   offsetFromSymbolStart = "300">
                </Location>
             </Locations>