Merge branch 'develop_PDFReaderProV4.6.1' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProV4.6.1

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSCursor+PDFListView.m

@@ -502,9 +502,6 @@ static NSCursor *textSelfSignCursor = nil;
     if (nil == squigglyNoteCursor) {
         [NSCursor addObserverForUserDefault];
         NSColor *color = [[NSUserDefaults standardUserDefaults] PDFListViewColorForKey:CSquigglyNoteColorKey];
-        if (color == nil) {
-            color = [NSColor colorWithRed:255/255.0 green:115/255.0 blue:22/255.0 alpha:1.0];
-        }
         NSImage *image = [[NSImage imageNamed:CPDFListViewImageNameCursorsStrikeout] copy];
         [image lockFocus];
         CGContextRef ref = [NSGraphicsContext currentContext].graphicsPort;

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/PDFListView+KMExtensions.swift

@@ -234,8 +234,6 @@ func CPDFListViewDrawFreeTextResizeHandle(_ context: CGContext, _ rect: NSRect,
 }
 
 // MARK: - NSUserDefaults
-let kAnnotationSquigglyDefaultColor = NSColor(red: 255/255.0, green: 115/255.0, blue: 22/255.0, alpha: 1.0)
-
 @objc extension UserDefaults {
     func PDFListViewColor(forKey key: String) -> NSColor? {
         let colorString = self.object(forKey: key) as? AnyObject

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m

@@ -295,9 +295,6 @@
                 break;
             case CAnnotationTypeSquiggly:
                 color = [userDefaults PDFListViewColorForKey:CSquigglyNoteColorKey];
-                if (color == nil) {
-                    color = [NSColor colorWithRed:255/255.0 green:115/255.0 blue:22/255.0 alpha:1.0];
-                }
                 break;
             case CAnnotationTypeLine:
                 color = [userDefaults PDFListViewColorForKey:CLineNoteColorKey];

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

@@ -288,7 +288,7 @@ class CPDFAnnotationMarkupExtraIvars: NSObject {
         } else if (annotationModel.annotationType == .squiggly) {
             let image = NSImage(named: "KMImageNameWavyLineIcon")
             if annotationModel.annotation == nil {
-                let color = UserDefaults.standard.PDFListViewColor(forKey: CSquigglyNoteColorKey) ?? kAnnotationSquigglyDefaultColor
+                let color = UserDefaults.standard.PDFListViewColor(forKey: CSquigglyNoteColorKey)
                 image?.changeColor(with: color)
             } else {
                 image?.changeColor(with: color)

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/NSObject/KMAnnotationPropertiesColorManager.swift

@@ -207,16 +207,16 @@ extension KMAnnotationPropertiesColorManager {
         if key == KMMarkupTypeOtherColors {
             return [
                 NSColor(red: 252.0 / 255.0, green: 31.0 / 255.0, blue: 31.0 / 255.0, alpha: 1.0),
-                NSColor(red: 41.0 / 255.0, green: 83.0 / 255.0, blue: 147.0 / 255.0, alpha: 1.0),
-                NSColor(red: 30.0 / 255.0, green: 137.0 / 255.0, blue: 86.0 / 255.0, alpha: 1.0),
-                NSColor(red: 184.0 / 255.0, green: 8.0 / 255.0, blue: 212.0 / 255.0, alpha: 1.0),
+                NSColor(red: 255.0 / 255.0, green: 144.0 / 255.0, blue: 0 / 255.0, alpha: 1.0),
+                NSColor(red: 0, green: 225.0 / 255.0, blue: 146.0 / 255.0, alpha: 1.0),
+                NSColor(red: 0, green: 175.0 / 255.0, blue: 249.0 / 255.0, alpha: 1.0),
                 NSColor(red: 37.0 / 255.0, green: 38.0 / 255.0, blue: 41.0 / 255.0, alpha: 1.0)
             ]
         } else if key == KMMarkupTypeHighlightColors {
-            return [NSColor(red: 255.0/255.0, green:250.0/255.0, blue:82.0/255.0, alpha:1.0),
-                    NSColor(red: 238.0/255.0, green:64.0/255.0, blue:36.0/255.0, alpha:1.0),
-                    NSColor(red: 243.0/255.0, green:151.0/255.0, blue:54.0/255.0, alpha:1.0),
-                    NSColor(red: 107.0/255.0, green:244.0/255.0, blue:73.0/255.0, alpha:1.0),
+            return [NSColor(red: 255.0 / 255.0, green: 229.0 / 255.0, blue: 0, alpha: 1.0),
+                    NSColor(red: 255.0/255.0, green:126.0/255.0, blue:126.0/255.0, alpha:1.0),
+                    NSColor(red: 62.0/255.0, green:237.0/255.0, blue:176.0/255.0, alpha:1.0),
+                    NSColor(red: 109.0/255.0, green:211.0/255.0, blue:255.0/255.0, alpha:1.0),
                     NSColor(red: 122/255.0, green: 68/255.0, blue: 255/255.0, alpha: 1.0)]
         } else if key == KMLinePropertColors {
             return [NSColor(red: 252.0/255.0, green: 31.0/255.0, blue: 31.0/255.0, alpha: 1.0),
@@ -232,11 +232,11 @@ extension KMAnnotationPropertiesColorManager {
                     NSColor(red: 189.0/255.0, green: 223.0/255.0, blue: 253.0/255.0, alpha: 1.0)]
         } else if key == KMInkPropertColors {
             return [
-                NSColor(red: 252.0/255.0, green: 31.0/255.0, blue: 31.0/255.0, alpha: 1.0),
-                NSColor(red: 41.0/255.0, green: 83.0/255.0, blue: 147.0/255.0, alpha: 1.0),
-                NSColor(red: 30.0/255.0, green: 137.0/255.0, blue: 86.0/255.0, alpha: 1.0),
-                NSColor(red: 184.0/255.0, green: 8.0/255.0, blue: 212.0/255.0, alpha: 1.0),
-                NSColor(red: 37/255.0, green: 38/255.0, blue: 41/255.0, alpha: 1.0)
+                NSColor(red: 252.0 / 255.0, green: 31.0 / 255.0, blue: 31.0 / 255.0, alpha: 1.0),
+                NSColor(red: 255.0 / 255.0, green: 144.0 / 255.0, blue: 0 / 255.0, alpha: 1.0),
+                NSColor(red: 0, green: 225.0 / 255.0, blue: 146.0 / 255.0, alpha: 1.0),
+                NSColor(red: 0, green: 175.0 / 255.0, blue: 249.0 / 255.0, alpha: 1.0),
+                NSColor(red: 37.0 / 255.0, green: 38.0 / 255.0, blue: 41.0 / 255.0, alpha: 1.0)
             ]
         } else if key == KMInkFillPropertColors {
             return [

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -639,9 +639,9 @@ class KMToolbarController: NSViewController {
                 let imageV = KMNoteTypeImageView()
                 item.image = imageV.noteTypeImage(withType: SKNStrikeOutString, color: color)
             } else if item.itemIdentifier == KMToolbarSquigglyAnnotationItemIdentifier {
-                let color = UserDefaults.standard.PDFListViewColor(forKey: CSquigglyNoteColorKey) ?? kAnnotationSquigglyDefaultColor
+                let color = UserDefaults.standard.PDFListViewColor(forKey: CSquigglyNoteColorKey)
                 let imageV = KMNoteTypeImageView()
-                item.image = imageV.noteTypeImage(withType: CPDFAnnotation.kType.squiggly, color: color)
+                item.image = imageV.noteTypeImage(withType: CPDFAnnotation.kType.squiggly, color: color ?? NSColor(red: 252.0/255.0, green: 31.0/255.0, blue: 31.0/255.0, alpha: 1.0))
             } else if item.itemIdentifier == KMToolbarInkAnnotationItemIdentifier {
                 let color = KMPreference.shared.markupPenColor
                 let imageV = KMNoteTypeImageView()

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -1776,8 +1776,8 @@ extension KMToolbarViewController {
         } else if identifier == KMToolbarSquigglyAnnotationItemIdentifier {
             item?.titleName = NSLocalizedString("Squiggly", comment: "")
             let imageV = KMNoteTypeImageView()
-            let color = UserDefaults.standard.PDFListViewColor(forKey: CSquigglyNoteColorKey) ?? kAnnotationSquigglyDefaultColor
-            item?.image = imageV.noteTypeImage(withType: "Squiggly", color: color)
+            let color = UserDefaults.standard.PDFListViewColor(forKey: CSquigglyNoteColorKey)
+            item?.image = imageV.noteTypeImage(withType: "Squiggly", color: color ?? NSColor(red: 255/255.0, green: 115/255.0, blue: 22/255.0, alpha: 1.0))
             item?.target = self
             item?.btnTag = CAnnotationType.squiggly.rawValue
             item?.isShowCustomToolTip = true

PDF Office/PDF Master/Class/Preference/Resource/InitialUserDefaults.plist

@@ -86,15 +86,17 @@
 		<key>SKSquareNoteColor</key>
 		<data>BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmAAEAAYY=</data>
 		<key>SKHighlightNoteColor</key>
-		<data>BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmAQEAAYY=</data>
+		<data>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmgy93fz+DrBhjP4OSgh89AYY=</data>
 		<key>SKUnderlineNoteColor</key>
-		<data>BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmAIM/AAAAAAGG</data>
+		<data>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmg2K1eD8Ag8L1yD0Bhg==</data>
 		<key>SKStrikeOutNoteColor</key>
-		<data>BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmAQAAAYY=</data>
+		<data>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmg2K1eD8Ag8L1yD0Bhg==</data>
+		<key>SKSquigglyNoteColor</key>
+		<data>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmg2K1eD8Ag8L1yD0Bhg==</data>
 		<key>SKLineNoteColor</key>
 		<data>BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmAAABAYY=</data>
 		<key>SKInkNoteColor</key>
-		<data>BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmAQAAAYY=</data>
+		<data>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARmZmZmg2K1eD8Ag8L1yD0Bhg==</data>
 		<key>SKCircleNoteInteriorColor</key>
 		<data>BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMDhAJmZgAAhg==</data>
 		<key>SKSquareNoteInteriorColor</key>
@@ -297,6 +299,7 @@
 			<string>SKHighlightNoteColor</string>
 			<string>SKUnderlineNoteColor</string>
 			<string>SKStrikeOutNoteColor</string>
+			<string>SKSquigglyNoteColor</string>
 			<string>SKLineNoteColor</string>
 			<string>SKInkNoteColor</string>
 			<string>SKCircleNoteInteriorColor</string>