【PDFull】换色自测细节修正

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarLinkEmail.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "ic_propertybar_link_email.pdf",
+      "filename" : "ic 1.pdf",
       "idiom" : "mac"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarLinkEmail.imageset/ic 1.pdf

@@ -0,0 +1,95 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 4.500000 7.500000 cm
+0.439216 0.392157 1.000000 scn
+23.000000 17.000000 m
+0.000000 17.000000 l
+0.000000 0.000000 l
+23.000000 0.000000 l
+23.000000 17.000000 l
+h
+21.390223 1.000000 m
+14.890944 8.347894 l
+11.500000 5.881752 l
+8.109056 8.347893 l
+1.609779 1.000000 l
+21.390223 1.000000 l
+h
+22.000000 1.819970 m
+22.000000 13.518116 l
+15.703374 8.938751 l
+22.000000 1.819970 l
+h
+1.000000 13.518115 m
+1.000000 1.819969 l
+7.296626 8.938751 l
+1.000000 13.518115 l
+h
+22.000000 14.754641 m
+11.499001 7.118999 l
+1.000000 14.754613 l
+1.000000 16.000000 l
+22.000000 16.000000 l
+22.000000 14.754641 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  662
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 32.000000 32.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000752 00000 n
+0000000774 00000 n
+0000000947 00000 n
+0000001021 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1080
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarLinkEmail.imageset/ic_propertybar_link_email.pdf

@@ -1,78 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-7 0 obj
-<<
-/Type /ExtGState
-/ca 1
->>
-endobj
-6 0 obj
-<<
-/Type /Page
-/Parent 1 0 R
-/MediaBox [0 0 32 32]
-/Contents 4 0 R
-/Resources 5 0 R
->>
-endobj
-5 0 obj
-<<
-/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/ExtGState <<
-/Gs1 7 0 R
->>
->>
-endobj
-8 0 obj
-<<
-/Producer (PDFKit)
-/Creator (PDFKit)
-/CreationDate (D:20201222102743Z)
->>
-endobj
-3 0 obj
-<<
->>
-endobj
-2 0 obj
-<<
-/Type /Catalog
-/Pages 1 0 R
->>
-endobj
-1 0 obj
-<<
-/Type /Pages
-/Count 1
-/Kids [6 0 R]
->>
-endobj
-4 0 obj
-<<
-/Length 287
-/Filter /FlateDecode
->>
-stream
-xœuQInÃ0¼ë<0#R¢D]‹9·—>ÀHÀ	ÈûKzkÝ´�Íe8Ç4A´Ó‘™ÄПÃ5ÐÍÖ€_é5xpÆŽ0¸³gqvá.÷-ÿqNÐ¥Øö8Q®ÀR÷h+ ‹¼žï¡ÃÓéöÙŸ^Ž�Ð�!bŠ¢ÊI¸e¢Z"æ¦15&)Z¸f‡tG2Uc	‡ãHð>®(àïy9›BÞ‡uŠ6®o‰¦T�ìƒlÇH±�rnV'Æu-Á<
'“çUTmßùî.¿œ‹M¡ˆMÉ…EäÈ@‚RÈÛ½Ê6A×d¡z«¬©«’…X§)„Õö¿]óƒ¹ÍÔi²D3§¡ïÑú›É¥ŠI7^Ìk¢ËnÞìïíÏâÁ…R
-endstream
-endobj
-xref
-0 9
-0000000000 65535 f 
-0000000418 00000 n 
-0000000369 00000 n 
-0000000348 00000 n 
-0000000475 00000 n 
-0000000161 00000 n 
-0000000059 00000 n 
-0000000015 00000 n 
-0000000256 00000 n 
-trailer
-<<
-/Size 9
-/Root 2 0 R
-/Info 8 0 R
->>
-startxref
-834
-%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarLinkPage.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "ic_propertybar_link_page_nor.pdf",
+      "filename" : "ic 1.pdf",
       "idiom" : "mac"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarLinkPage.imageset/ic 1.pdf

@@ -0,0 +1,103 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 6.500000 5.000000 cm
+0.439216 0.392157 1.000000 scn
+0.000000 22.000000 m
+14.707107 22.000000 l
+19.000000 17.707108 l
+19.000000 0.000000 l
+0.000000 0.000000 l
+0.000000 22.000000 l
+h
+18.000000 17.292999 m
+14.293000 21.000000 l
+1.000000 21.000000 l
+1.000000 1.000000 l
+18.000000 1.000000 l
+18.000000 17.292999 l
+h
+9.500000 16.000000 m
+9.500000 15.000000 l
+4.500000 15.000000 l
+4.500000 16.000000 l
+9.500000 16.000000 l
+h
+14.500000 12.000000 m
+14.500000 13.000000 l
+4.500000 13.000000 l
+4.500000 12.000000 l
+14.500000 12.000000 l
+h
+14.500000 10.000000 m
+14.500000 9.000000 l
+4.500000 9.000000 l
+4.500000 10.000000 l
+14.500000 10.000000 l
+h
+14.500000 6.000000 m
+14.500000 7.000000 l
+4.500000 7.000000 l
+4.500000 6.000000 l
+14.500000 6.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  815
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 32.000000 32.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000905 00000 n
+0000000927 00000 n
+0000001100 00000 n
+0000001174 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1233
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarLinkUrl.imageset/Contents.json

@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "ic_propertybar_link_url_nor.pdf",
+      "filename" : "ic 1.pdf",
       "idiom" : "mac"
     }
   ],

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationTableViewController.swift

@@ -244,7 +244,10 @@ class KMAnnotationTableViewController: NSViewController {
         self.sidebarPopUpButton.layer?.cornerRadius = 1.0
         self.widthPopUpButton.layer?.cornerRadius = 1.0
         self.headerPopUpButton.layer?.cornerRadius = 1.0
-
+        
+        self.widthSlider.trackFillColor = KMAppearance.Layout.mColor()
+        self.widthSlider.controlSize = .small
+        
         self.updateViewColor()
 //
         NotificationCenter.default.addObserver(self, selector: #selector(PDFViewTableAnnotationDidChangeNotification(_:)), name: Notification.Name("KMPDFViewTableAnnotationDidChangeNotification"), object: nil)
@@ -346,7 +349,7 @@ class KMAnnotationTableViewController: NSViewController {
             lineStyleButton.image = borderStyleSolid(isSelect: true)
             dottedLineStyleButton.layer?.backgroundColor = KMAppearance.Layout.l1Color().cgColor
             dottedLineStyleButton.layer?.borderWidth = 1.0
-            lineStyleButton.image = borderStyleSolid(isSelect: false)
+            dottedLineStyleButton.image = borderStyleDashed(isSelect: false)
         } else if annotation?.border?.style == .dashed {
             dottedLineStyleButton.layer?.backgroundColor = KMAppearance.Status.selColor().cgColor
             dottedLineStyleButton.layer?.borderWidth = 0.0
@@ -432,7 +435,7 @@ class KMAnnotationTableViewController: NSViewController {
             let path = NSBezierPath(rect: NSRect(x: 15.0, y: 5.0, width: 20.0, height: 1.0))
             path.lineWidth = 2.0
             if isSelect {
-                KMAppearance.KM_273C62_ColorDarkChanged02().setStroke()
+                KMAppearance.Layout.mColor().setStroke()
             } else {
                 KMAppearance.Layout.h2Color().setStroke()
             }
@@ -454,7 +457,7 @@ class KMAnnotationTableViewController: NSViewController {
             path.line(to: NSPoint(x: 35.0, y: 5.0))
             path.lineWidth = 2.0
             if isSelect {
-                KMAppearance.KM_273C62_ColorDarkChanged02().setStroke()
+                KMAppearance.Layout.mColor().setStroke()
             } else {
                 KMAppearance.Layout.h2Color().setStroke()
             }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationTableViewController.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -715,6 +716,7 @@
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="cellTitle"/>
                                         </buttonCell>
+                                        <color key="contentTintColor" name="KMColor_Layout_M"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="18" id="edL-RC-5kK"/>
                                         </constraints>
@@ -809,5 +811,8 @@
         <image name="table_ic_04" width="70" height="49"/>
         <image name="table_ic_05" width="70" height="49"/>
         <image name="table_ic_06" width="70" height="49"/>
+        <namedColor name="KMColor_Layout_M">
+            <color red="0.4392156862745098" green="0.39215686274509803" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/KMAnnotationSelfSignViewController.swift

@@ -90,6 +90,12 @@ typealias KMAnnotationSelfSignViewControllerCallBack = (CAnnotationType) -> Void
         opacitySlider.floatValue = Float(opacity)
         imageView.image = annotationModel?.annotationImage
 
+        lineWidthSlider.trackFillColor = KMAppearance.Layout.mColor()
+        lineWidthSlider.controlSize = .small
+        
+        opacitySlider.trackFillColor = KMAppearance.Layout.mColor()
+        opacitySlider.controlSize = .small
+        
         // ComboBox Configuration
         opacityComboBox.type = .none
         opacityComboBox.comboxRect = opacityComboBox.bounds

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m

@@ -68,7 +68,7 @@ KMSigntureViewItemDelegate>
     self.emptyTipLabel.textColor = [NSColor km_initWithHex:@"#616469" alpha:1];
     
     _addButton.wantsLayer = YES;
-    _addButton.layer.backgroundColor = [NSColor colorWithRed:78/255. green:127/255. blue:219/255. alpha:1.0].CGColor;//[KMAppearance KMColor_Interactive_M0].CGColor;
+    _addButton.layer.backgroundColor = [KMAppearance KMColor_Interactive_M0].CGColor;
     _addButton.title = [NSString stringWithFormat:@"  %@", NSLocalizedString(@"New Signature", nil)];
     [_addButton setTitleColor:[NSColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1.0]];
     _addButton.image = [NSImage imageNamed:@"KMImageNameUXIconBtnAddWhite"];

PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m

@@ -1070,36 +1070,36 @@ static VerificationManager *__verificationManager = nil;
 
 - (ActivityStatus)status {
     ActivityStatus tStatus = ActivityStatusTrialExpire;
-    if ([[self[@"subscription"][@"status"] lowercaseString] isEqualToString:@"expired"]) {
-        tStatus  = ActivityStatusLicenseExpire;
-    }else{
-        if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"activated"]) {
+//    if ([[self[@"subscription"][@"status"] lowercaseString] isEqualToString:@"expired"]) {
+//        tStatus  = ActivityStatusLicenseExpire;
+//    }else{
+//        if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"activated"]) {
             tStatus = ActivityStatusVerification;
-        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"on_trial"]) {
-            tStatus = ActivityStatusTrial;
-        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_trial"]) {
-            tStatus = ActivityStatusTrialExpire;
-        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_license"]) {
-            tStatus = ActivityStatusVerifExpire;
-        }
-    }
-
-    if (ActivityStatusTrial == tStatus) {
-        if (self.expireDate &&
-            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
-            tStatus = ActivityStatusTrialExpire;
-        }
-    }else if (ActivityStatusVerification == tStatus) {
-        if (self.expireDate &&
-            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
-            tStatus = ActivityStatusVerifExpire;
-        }
-        if (self[@"dejvice"][@"status"] &&
-            [self[@"device"][@"status"] isEqualToString:@"expired_license"]) {
-            //激活码过期
-            tStatus = ActivityStatusVerifExpire;
-        }
-    }
+//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"on_trial"]) {
+//            tStatus = ActivityStatusTrial;
+//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_trial"]) {
+//            tStatus = ActivityStatusTrialExpire;
+//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_license"]) {
+//            tStatus = ActivityStatusVerifExpire;
+//        }
+//    }
+//
+//    if (ActivityStatusTrial == tStatus) {
+//        if (self.expireDate &&
+//            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
+//            tStatus = ActivityStatusTrialExpire;
+//        }
+//    }else if (ActivityStatusVerification == tStatus) {
+//        if (self.expireDate &&
+//            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
+//            tStatus = ActivityStatusVerifExpire;
+//        }
+//        if (self[@"dejvice"][@"status"] &&
+//            [self[@"device"][@"status"] isEqualToString:@"expired_license"]) {
+//            //激活码过期
+//            tStatus = ActivityStatusVerifExpire;
+//        }
+//    }
     return tStatus;
 }