Explorar o código

【兼容】• NSColor.initWithHex:alpha:

lizhe hai 1 ano
pai
achega
a656e1e4d2
Modificáronse 100 ficheiros con 668 adicións e 646 borrados
  1. 13 13
      PDF Office/PDF Master.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  2. 8 8
      PDF Office/PDF Master/Class/Appearance/KMAppearance.swift
  3. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift
  4. 5 5
      PDF Office/PDF Master/Class/ChromiumTabs/KMToolbarRightView.swift
  5. 2 2
      PDF Office/PDF Master/Class/Common/Base/KMBaseViewController.swift
  6. 1 1
      PDF Office/PDF Master/Class/Common/Control/KMThumbnailView.swift
  7. 3 3
      PDF Office/PDF Master/Class/Common/Designs/KMDesignBaseView.swift
  8. 2 2
      PDF Office/PDF Master/Class/ComponentLibrary/Category/KMDesignToken+Border.swift
  9. 3 3
      PDF Office/PDF Master/Class/ComponentLibrary/Category/KMDesignToken+BorderColor.swift
  10. 2 2
      PDF Office/PDF Master/Class/ComponentLibrary/Category/KMDesignToken+BoxShadow.swift
  11. 3 3
      PDF Office/PDF Master/Class/ComponentLibrary/Category/KMDesignToken+Fill.swift
  12. 34 10
      PDF Office/PDF Master/Class/Home/Category/NSColor+KMExtensions.swift
  13. 1 1
      PDF Office/PDF Master/Class/Home/View/KMBox.swift
  14. 2 2
      PDF Office/PDF Master/Class/Home/View/KMDottedLineView.swift
  15. 2 2
      PDF Office/PDF Master/Class/Home/View/KMHomeDragView.swift
  16. 4 4
      PDF Office/PDF Master/Class/Home/ViewController/KMAILanguagePopVC.swift
  17. 10 10
      PDF Office/PDF Master/Class/Home/ViewController/KMAIOpenPDFFilesVC.swift
  18. 62 62
      PDF Office/PDF Master/Class/Home/ViewController/KMAIRewritingVC.swift
  19. 17 17
      PDF Office/PDF Master/Class/Home/ViewController/KMAITranslationVC.swift
  20. 6 6
      PDF Office/PDF Master/Class/Home/ViewController/KMFastToolCollectionViewItem.swift
  21. 6 6
      PDF Office/PDF Master/Class/Home/ViewController/KMHistoryFileCollectionViewItem.swift
  22. 1 1
      PDF Office/PDF Master/Class/Home/ViewController/KMHomeFastToolViewController.swift
  23. 19 19
      PDF Office/PDF Master/Class/Home/ViewController/KMHomeHistoryFileViewController.swift
  24. 3 3
      PDF Office/PDF Master/Class/Home/ViewController/KMHomePopViewController.swift
  25. 1 1
      PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+UI.swift
  26. 18 18
      PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift
  27. 3 3
      PDF Office/PDF Master/Class/Home/ViewController/KMPDFToolsViewController.swift
  28. 2 2
      PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignPropertySelector.swift
  29. 17 17
      PDF Office/PDF Master/Class/Home/WindowController/KMAITranslationConfirmWindowController.swift
  30. 58 58
      PDF Office/PDF Master/Class/Home/WindowController/KMAITranslationWindowController.swift
  31. 1 1
      PDF Office/PDF Master/Class/Home/WindowController/KMHistoryFileDeleteWindowController.swift
  32. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/KMAccountInfoWindowController.swift
  33. 23 23
      PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoView.swift
  34. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/Cancellation/KMCancellationWindowController.swift
  35. 2 2
      PDF Office/PDF Master/Class/KMLightMember/Controller/Cancellation/View/KMCancellationSuccessView.swift
  36. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.swift
  37. 5 5
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/KMComparativeOutlineView.swift
  38. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/View/KMComparativeOutlineCell.swift
  39. 7 7
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/View/KMComparativeOutlineRowView.swift
  40. 2 2
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/View/KMComparativeOutlineSectionCell.swift
  41. 5 5
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeTableView.swift
  42. 9 9
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/KMComparativeView.swift
  43. 21 21
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItem.swift
  44. 2 2
      PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItemItem.swift
  45. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/KMLoginWindowController.swift
  46. 4 4
      PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLightNoNetworkView.swift
  47. 17 17
      PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginInputPasswordView.swift
  48. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginLeftImageView.swift
  49. 12 12
      PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginView.swift
  50. 15 15
      PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMRegisterSuccessView.swift
  51. 25 25
      PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMRegisterView.swift
  52. 23 23
      PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMResetPasswordView.swift
  53. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/SubscribeSuccess/KMSubscribeSuccessWindowController.swift
  54. 4 4
      PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/SubscribeSuccess/View/KMSubscribeSuccessView.swift
  55. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift
  56. 2 2
      PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkCollectionItem.swift
  57. 17 18
      PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift
  58. 1 1
      PDF Office/PDF Master/Class/KMLightMember/Controller/VerificationCode/KMVerficationCodeWindowController.swift
  59. 2 2
      PDF Office/PDF Master/Class/KMLightMember/Controller/VerificationCode/View/KMLightMemberAlertView.swift
  60. 14 14
      PDF Office/PDF Master/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift
  61. 2 2
      PDF Office/PDF Master/Class/KMLightMember/Tools/Alert/KMPurchaseAlertView.swift
  62. 1 2
      PDF Office/PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m
  63. 1 1
      PDF Office/PDF Master/Class/PDFTools/Batch/KMBatchWindowController.swift
  64. 1 1
      PDF Office/PDF Master/Class/PDFTools/Batch/View/BatchCollectionView/KMBatchCollectionView.swift
  65. 3 3
      PDF Office/PDF Master/Class/PDFTools/Batch/View/BatchCollectionView/View/KMBatchCollectionViewItem.swift
  66. 4 4
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Background/KMBatchBackgroundView.swift
  67. 10 10
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/BatchRemove/KMBatchRemoveView.swift
  68. 4 4
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/BatesNumber/KMBatchBatesNumberView.swift
  69. 10 10
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Compress/KMBatchCompressView.swift
  70. 7 7
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/KMBatchConvertPDFView.swift
  71. 3 3
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/CSV/KMBatchConverPDFCSVView.swift
  72. 6 6
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/Excel/KMBatchConverPDFExcelView.swift
  73. 2 2
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/Image/KMBatchConverPDFImageView.swift
  74. 3 3
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/TextRecognition/KMBatchTextRecognitionView.swift
  75. 3 3
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/Word/KMBatchConverPDFWordView.swift
  76. 4 4
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Header&Footer/KMBatchHeaderAndFooterView.swift
  77. 1 1
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/KMBatchSettingView.swift
  78. 16 16
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Security/KMBatchSecurityView.swift
  79. 4 4
      PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Watermark/KMBatchWatermarkView.swift
  80. 5 5
      PDF Office/PDF Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.swift
  81. 1 1
      PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertCSVSettingView.swift
  82. 1 1
      PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertExcelSettingView.swift
  83. 2 2
      PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertImageSettingView.swift
  84. 1 1
      PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertOCRSettingItemView.swift
  85. 1 1
      PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertPageRangeSettingItemView.swift
  86. 1 1
      PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertSettingLimitTipView.swift
  87. 1 1
      PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertWordSettingView.swift
  88. 2 2
      PDF Office/PDF Master/Class/PDFTools/ImageToPDF/KMImageToPDFWindowController.swift
  89. 3 3
      PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/SelectedFiles/KMBatchSelectedFilesView.swift
  90. 1 1
      PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingColumnHeaderCell.swift
  91. 1 1
      PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNameTableCell.swift
  92. 3 3
      PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingOrderTableCell.swift
  93. 1 1
      PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingSizeTableCell.swift
  94. 6 6
      PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingTableRowView.swift
  95. 17 17
      PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMImageToPDFChooseView/KMImageToPDFChooseView.swift
  96. 3 3
      PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift
  97. 1 1
      PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPDFEditToolbar.swift
  98. 1 1
      PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditInsertDirectionItemView.swift
  99. 1 1
      PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditInsertPageSizeItemView.swift
  100. 0 0
      PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditThumbnailItem.swift

+ 13 - 13
PDF Office/PDF Master.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -4936,8 +4936,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "205"
             endingLineNumber = "205"
-            landmarkName = "KMSearchViewController"
-            landmarkType = "21">
+            landmarkName = "searchDoneAction()"
+            landmarkType = "7">
             <Locations>
                <Location
                   uuid = "AB8DA2DC-3C2F-46B5-A11A-31FC8C147064 - 6109d6de1aa86a64"
@@ -5014,8 +5014,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "583"
             endingLineNumber = "583"
-            landmarkName = "KMSearchViewController"
-            landmarkType = "21">
+            landmarkName = "controlTextDidEndEditing(_:)"
+            landmarkType = "7">
             <Locations>
                <Location
                   uuid = "E22CD419-B76B-42D7-B07F-D287D150D2FB - 7ae7174983970b10"
@@ -5137,8 +5137,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "573"
             endingLineNumber = "573"
-            landmarkName = "unknown"
-            landmarkType = "0">
+            landmarkName = "KMSearchViewController"
+            landmarkType = "21">
             <Locations>
                <Location
                   uuid = "F5340931-A259-4D7D-B619-1532585414E2 - 5931138e4c04bcad"
@@ -6442,7 +6442,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1947"
             endingLineNumber = "1947"
-            landmarkName = "displaySecondaryPDFView(withUrl:)"
+            landmarkName = "displaySinglePageScreen(isSinglePage:doublePageScreen:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -6685,7 +6685,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1993"
             endingLineNumber = "1993"
-            landmarkName = "receivedFileUrl(_:)"
+            landmarkName = "updateNextAndPreViousButtonState()"
             landmarkType = "7">
             <Locations>
                <Location
@@ -11824,8 +11824,8 @@
             filePath = "PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1090"
-            endingLineNumber = "1090"
+            startingLineNumber = "1089"
+            endingLineNumber = "1089"
             landmarkName = "-tableView:acceptDrop:row:dropOperation:"
             landmarkType = "7">
          </BreakpointContent>
@@ -12234,9 +12234,9 @@
             filePath = "PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1157"
-            endingLineNumber = "1157"
-            landmarkName = "-_clearData"
+            startingLineNumber = "1156"
+            endingLineNumber = "1156"
+            landmarkName = "-tableView:rowViewForRow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 8 - 8
PDF Office/PDF Master/Class/Appearance/KMAppearance.swift

@@ -22,42 +22,42 @@ import Cocoa
 
     @objc class func titleColor() -> NSColor {
         if (!KMAppearance.isSupportNewColor()) {
-            return NSColor(hex: "#252629")
+            return NSColor.km_init(hex: "#252629")
         }
         if let _color = NSColor(named: "KMTitleColor") {
             return _color
         }
-        return NSColor(hex: "#252629")
+        return NSColor.km_init(hex: "#252629")
     }
     
     @objc class func subtitleColor() -> NSColor {
         if (!KMAppearance.isSupportNewColor()) {
-            return NSColor(hex: "#616469")
+            return NSColor.km_init(hex: "#616469")
         }
         if let _color = NSColor(named: "KMSubtitleColor") {
             return _color
         }
-        return NSColor(hex: "#616469")
+        return NSColor.km_init(hex: "#616469")
     }
     
     @objc class func view_bg_dis_color() -> NSColor {
         if (!KMAppearance.isSupportNewColor()) {
-            return NSColor(hex: "#EDEEF0")
+            return NSColor.km_init(hex: "#EDEEF0")
         }
         if let _color = NSColor(named: "KMBackgroundDisableColor") {
             return _color
         }
-        return NSColor(hex: "#EDEEF0")
+        return NSColor.km_init(hex: "#EDEEF0")
     }
     
     @objc class func view_border_dis_color() -> NSColor {
         if (!KMAppearance.isSupportNewColor()) {
-            return NSColor(hex: "#DFE1E5")
+            return NSColor.km_init(hex: "#DFE1E5")
         }
         if let _color = NSColor(named: "KMBorderDisableColor") {
             return _color
         }
-        return NSColor(hex: "#DFE1E5")
+        return NSColor.km_init(hex: "#DFE1E5")
     }
     
     class func isSupportNewColor() -> Bool {

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -21,7 +21,7 @@ import Cocoa
     override func windowDidLoad() {
         super.windowDidLoad()
         
-        window?.backgroundColor = NSColor(hex: "#DFE1E5")
+        window?.backgroundColor = NSColor.km_init(hex: "#DFE1E5")
         
 //        window?.setFrameAutosaveName("")
         rightTabStripView_.delete = self

+ 5 - 5
PDF Office/PDF Master/Class/ChromiumTabs/KMToolbarRightView.swift

@@ -59,7 +59,7 @@ import Cocoa
                 self.advancedContentView.isHidden = false
                 self.advancedViewRightConstraint.constant = 8.0
                 self.advancedLabel.font = NSFont.SFProTextRegularFont(12.0)
-                self.advancedLabel.textColor = NSColor(hex: "#FFFFFF")
+                self.advancedLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
                 
                 var advancedString = NSLocalizedString("Upgrade", comment: "")
 //                if KMLightMemberManager.manager.purchaseState == .trial {
@@ -76,16 +76,16 @@ import Cocoa
         
         if self.userInfoButton != nil {
             if KMLightMemberManager.manager.info.email.count != 0 {
-                self.userInfoButton.backgroundColor(NSColor(hex: "#1770F4"))
+                self.userInfoButton.backgroundColor(NSColor.km_init(hex: "#1770F4"))
                 self.userInfoButton.font = NSFont.SFProTextSemiboldFont(14.0)
-                self.userInfoButton.contentTintColor = NSColor(hex: "#FFFFFF")
-                self.userInfoButton.border(NSColor(hex: "#1770F4"), 1, 12)
+                self.userInfoButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
+                self.userInfoButton.border(NSColor.km_init(hex: "#1770F4"), 1, 12)
                 self.userInfoButton.title = KMLightMemberManager.manager.info.email.substring(to: 1)
                 self.userInfoButton.image = nil
             } else {
                 self.userInfoButton.image = NSImage(named: "Icon_other_avatar_false")
                 self.userInfoButton.title = ""
-                self.userInfoButton.border(NSColor(hex: "#1770F4"), 0, 12)
+                self.userInfoButton.border(NSColor.km_init(hex: "#1770F4"), 0, 12)
                 self.userInfoButton.backgroundColor(NSColor.clear)
             }
         }

+ 2 - 2
PDF Office/PDF Master/Class/Common/Base/KMBaseViewController.swift

@@ -384,9 +384,9 @@ class KMBaseViewController: NSViewController {
         let progressC = SKProgressController()
         progressC.showClose = false
         progressC.message = message
-        progressC.window?.backgroundColor = NSColor(hex: "#36383B")
+        progressC.window?.backgroundColor = NSColor.km_init(hex: "#36383B")
         progressC.window?.contentView?.wantsLayer = true
-        progressC.window?.contentView?.layer?.backgroundColor = NSColor(hex: "#36383B").cgColor
+        progressC.window?.contentView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
         progressC.progressField.textColor = NSColor.white
         
         self.progressC = progressC

+ 1 - 1
PDF Office/PDF Master/Class/Common/Control/KMThumbnailView.swift

@@ -222,7 +222,7 @@ import Cocoa
         view.isSelectable = true
         
         view.wantsLayer = true
-        view.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
+        view.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
         
         return view
     }()

+ 3 - 3
PDF Office/PDF Master/Class/Common/Designs/KMDesignBaseView.swift

@@ -79,7 +79,7 @@ class KMDesignBaseView: NSView {
         } else {
             let model = KMDesignToken.shared.tokenUsesModel(withToken: bgToken)
             if let data = model.border as? String {
-                self.borderColor = NSColor(hex: data)
+                self.borderColor = NSColor.km_init(hex: data)
             }
             if let data = model.borderRadius as? String, let _value = Float(data) {
                 self.borderRadius = CGFloat(_value)
@@ -88,7 +88,7 @@ class KMDesignBaseView: NSView {
                 self.borderWidth = CGFloat(_value)
             }
             if let data = model.fill as? String {
-                self.fillColor = NSColor(hex: data)
+                self.fillColor = NSColor.km_init(hex: data)
             }
         }
         
@@ -96,7 +96,7 @@ class KMDesignBaseView: NSView {
         if (!textToken.isEmpty) {
             let model = KMDesignToken.shared.tokenUsesModel(withToken: textToken)
             if let data = model.fill as? String {
-                self.textColor = NSColor(hex: data)
+                self.textColor = NSColor.km_init(hex: data)
             }
             
             let tModel = KMDesignToken.shared.typography(withToken: textToken)

+ 2 - 2
PDF Office/PDF Master/Class/ComponentLibrary/Category/KMDesignToken+Border.swift

@@ -23,9 +23,9 @@ extension KMDesignToken {
             let border = model.border as! String
             if border.contains(",") {
                 let keys = border.split(separator: ",")
-                borderColor = NSColor(hex: String(keys[0]), alpha: Float(String(keys[1]).stringToCGFloat()))
+                borderColor = NSColor.km_init(hex: String(keys[0]), alpha: Float(String(keys[1]).stringToCGFloat()))
             } else {
-                borderColor = NSColor(hex: border)
+                borderColor = NSColor.km_init(hex: border)
             }
         }
         return borderColor

+ 3 - 3
PDF Office/PDF Master/Class/ComponentLibrary/Category/KMDesignToken+BorderColor.swift

@@ -9,7 +9,7 @@ import Foundation
 
 extension KMDesignToken {
     func borderColorNodeUsesAction(control: Any, node: Any) -> Bool {
-        let borderColor = NSColor(hex: (node as! String))
+        let borderColor = NSColor.km_init(hex: (node as! String))
         if (control as AnyObject).isKind(of: NSView.self) {
             (control as! NSView).wantsLayer = true
             (control as! NSView).layer?.borderColor = borderColor.cgColor
@@ -30,9 +30,9 @@ extension KMDesignToken {
             let border = model.borderColor as! String
             if border.contains(",") {
                 let keys = border.split(separator: ",")
-                borderColor = NSColor(hex: String(keys[0]), alpha: Float(String(keys[1]).stringToCGFloat()))
+                borderColor = NSColor.km_init(hex: String(keys[0]), alpha: Float(String(keys[1]).stringToCGFloat()))
             } else {
-                borderColor = NSColor(hex: border)
+                borderColor = NSColor.km_init(hex: border)
             }
         }
         return borderColor

+ 2 - 2
PDF Office/PDF Master/Class/ComponentLibrary/Category/KMDesignToken+BoxShadow.swift

@@ -29,9 +29,9 @@ extension KMDesignToken {
             let boxShadow = boxShadow["color"]!
             if boxShadow.contains(",") {
                 let keys = boxShadow.split(separator: ",")
-                boxShadowColor = NSColor(hex: String(keys[0]), alpha: Float(String(keys[1]).stringToCGFloat()))
+                boxShadowColor = NSColor.km_init(hex: String(keys[0]), alpha: Float(String(keys[1]).stringToCGFloat()))
             } else {
-                boxShadowColor = NSColor(hex: boxShadow)
+                boxShadowColor = NSColor.km_init(hex: boxShadow)
             }
         }
         value.color = boxShadowColor

+ 3 - 3
PDF Office/PDF Master/Class/ComponentLibrary/Category/KMDesignToken+Fill.swift

@@ -9,7 +9,7 @@ import Foundation
 
 extension KMDesignToken {
     func fillNodeUsesAction(control: Any, node: Any) -> Bool {
-        let fillColor = NSColor(hex: (node as! String))
+        let fillColor = NSColor.km_init(hex: (node as! String))
         if (control as AnyObject).isKind(of: NSView.self) {
             (control as! NSView).wantsLayer = true
             (control as! NSView).layer?.backgroundColor = fillColor.cgColor
@@ -30,9 +30,9 @@ extension KMDesignToken {
             let fill = model.fill as! String
             if fill.contains(",") {
                 let keys = fill.split(separator: ",")
-                fillColor = NSColor(hex: String(keys[0]), alpha: Float(String(keys[1]).stringToCGFloat()))
+                fillColor = NSColor.km_init(hex: String(keys[0]), alpha: Float(String(keys[1]).stringToCGFloat()))
             } else {
-                fillColor = NSColor(hex: fill)
+                fillColor = NSColor.km_init(hex: fill)
             }
         }
         return fillColor

+ 34 - 10
PDF Office/PDF Master/Class/Home/Category/NSColor+KMExtensions.swift

@@ -8,7 +8,32 @@
 import Foundation
 
 public extension NSColor {
-    @objc convenience init(hex: String, alpha: Float = 1.0) {
+//    @objc convenience init(hex: String, alpha: Float = 1.0) {
+//        let trimHex = hex.trimmingCharacters(in: .whitespacesAndNewlines)
+//        let dropHash = String(trimHex.dropFirst()).trimmingCharacters(in: .whitespacesAndNewlines)
+//        let hexString = trimHex.starts(with: "#") ? dropHash : trimHex
+//        let ui64 = UInt64(hexString, radix: 16)
+//        let value = ui64 != nil ? Int(ui64!) : 0
+//        // #RRGGBB
+//        var components = (
+//            R: CGFloat((value >> 16) & 0xff) / 255,
+//            G: CGFloat((value >> 08) & 0xff) / 255,
+//            B: CGFloat((value >> 00) & 0xff) / 255,
+//            a: CGFloat(alpha)
+//        )
+//        if String(hexString).count == 8 {
+//            // #RRGGBBAA
+//            components = (
+//                R: CGFloat((value >> 24) & 0xff) / 255,
+//                G: CGFloat((value >> 16) & 0xff) / 255,
+//                B: CGFloat((value >> 08) & 0xff) / 255,
+//                a: CGFloat((value >> 00) & 0xff) / 255
+//            )
+//        }
+//        self.init(red: components.R, green: components.G, blue: components.B, alpha: components.a)
+//    }
+    
+    @objc static func km_init(hex: String, alpha: Float = 1.0) -> NSColor {
         let trimHex = hex.trimmingCharacters(in: .whitespacesAndNewlines)
         let dropHash = String(trimHex.dropFirst()).trimmingCharacters(in: .whitespacesAndNewlines)
         let hexString = trimHex.starts(with: "#") ? dropHash : trimHex
@@ -30,9 +55,8 @@ public extension NSColor {
                 a: CGFloat((value >> 00) & 0xff) / 255
             )
         }
-        self.init(red: components.R, green: components.G, blue: components.B, alpha: components.a)
+        return NSColor.init(red: components.R, green: components.G, blue: components.B, alpha: components.a)
     }
-    
 //    convenience init(hex: String) {
 //        let trimHex = hex.trimmingCharacters(in: .whitespacesAndNewlines)
 //        let dropHash = String(trimHex.dropFirst()).trimmingCharacters(in: .whitespacesAndNewlines)
@@ -80,31 +104,31 @@ public extension NSColor {
 // MARK: Function
 extension NSColor {
     class func titleColor() -> NSColor {
-        return NSColor(hex: "#252629")
+        return NSColor.km_init(hex: "#252629")
     }
     
     class func despColor() -> NSColor {
-        return NSColor(hex: "#616469")
+        return NSColor.km_init(hex: "#616469")
     }
     
     // button
     class func buttonTitleColor(enabled: Bool = true) -> NSColor {
         if (enabled) {
-            return NSColor(hex: "#252629")
+            return NSColor.km_init(hex: "#252629")
         } else {
-            return NSColor(hex: "#F7F8FA")
+            return NSColor.km_init(hex: "#F7F8FA")
         }
     }
     
     class func buttonFunctionBackgroundColor(enabled: Bool = true) -> NSColor {
         if (enabled) {
-            return NSColor(hex: "#1770F4")
+            return NSColor.km_init(hex: "#1770F4")
         } else {
-            return NSColor(hex: "#BDDFFD")
+            return NSColor.km_init(hex: "#BDDFFD")
         }
     }
     
     class func buttonBorderColor() -> NSColor {
-        return NSColor(hex: "#DFE1E5")
+        return NSColor.km_init(hex: "#DFE1E5")
     }
 }

+ 1 - 1
PDF Office/PDF Master/Class/Home/View/KMBox.swift

@@ -28,7 +28,7 @@ typealias mouseRightDownCallback = (_ downEntered: Bool, _ mouseBox: KMBox, _ ev
     var lineDash: [CGFloat] = [3, 3, 3]
     var dottedLineRadius = 8.0
     var dottedLineWidth = 1.0
-    var dottedLineColor: NSColor = NSColor(hex: "#68ACF8")
+    var dottedLineColor: NSColor = NSColor.km_init(hex: "#68ACF8")
     var canDoubleClick : Bool = false //是否运行多次点击
     
     var area: NSTrackingArea?

+ 2 - 2
PDF Office/PDF Master/Class/Home/View/KMDottedLineView.swift

@@ -34,14 +34,14 @@ class KMDottedLineView: NSView {
         if ((self.state == .Hover) || (self.state == .Select)) {
             let path = NSBezierPath(roundedRect: self.bounds, xRadius: 8.0, yRadius: 8.0)
             path.lineWidth = 1.0
-            NSColor(hex: "#68ACF8").setStroke()
+            NSColor.km_init(hex: "#68ACF8").setStroke()
             path.stroke()
         } else {
             let path = NSBezierPath(roundedRect: self.bounds, xRadius: 8.0, yRadius: 8.0)
             
             path.setLineDash([3, 3, 3], count: 3, phase: 0)
             path.lineWidth = 1.0
-            NSColor(hex: "#CED0D4").setStroke()
+            NSColor.km_init(hex: "#CED0D4").setStroke()
             path.stroke()
         }
     }

+ 2 - 2
PDF Office/PDF Master/Class/Home/View/KMHomeDragView.swift

@@ -60,7 +60,7 @@ class KMHomeDragView: NSView {
 
     func dragEntered(_ isDragEntered: Bool) -> Void {
         if isDragEntered {
-            self.layer?.backgroundColor = NSColor(hex: "#1770F4", alpha: 0.1).cgColor
+            self.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1).cgColor
             self.layer?.cornerRadius = 16.0
             dragView.wantsLayer = true
             dragView.layer?.backgroundColor = KMDesignToken.shared.fill(withToken: "notification.toast.bg").cgColor
@@ -172,7 +172,7 @@ class KMHomeDragView: NSView {
             
             path.setLineDash([3, 3, 3], count: 3, phase: 0)
             path.lineWidth = 2.0
-            NSColor(hex: "#68ACF8").setStroke()
+            NSColor.km_init(hex: "#68ACF8").setStroke()
             path.stroke()
         }
     }

+ 4 - 4
PDF Office/PDF Master/Class/Home/ViewController/KMAILanguagePopVC.swift

@@ -23,13 +23,13 @@ class KMAILanguagePopTableviewCell: NSTableCellView {
         super.awakeFromNib()
         
         self.mainBox.fillColor = .clear
-        self.languageLabel.textColor = NSColor(hex: "#252629")
+        self.languageLabel.textColor = NSColor.km_init(hex: "#252629")
         self.languageLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.mainBox.moveCallback =  { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if !self.isSelect {
                 if mouseEntered {
-                    self.mainBox.fillColor = NSColor(hex: "#EDEEF0")
+                    self.mainBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
                 } else {
                     self.mainBox.fillColor = .clear
                 }
@@ -38,7 +38,7 @@ class KMAILanguagePopTableviewCell: NSTableCellView {
         self.mainBox.downCallback = { [unowned self](downEntered: Bool, mouseBox: KMBox, event) -> Void in
             if downEntered {
                 if !self.isSelect {
-                    self.mainBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
+                    self.mainBox.fillColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1)
                 }
             }
         }
@@ -93,7 +93,7 @@ class KMAILanguagePopVC: NSViewController, NSTableViewDelegate, NSTableViewDataS
         cellView.languageLabel.stringValue = language
         cellView.refreshAIUI()
         if language == self.selectString {
-            cellView.mainBox.fillColor = NSColor(hex: "#0A82FF", alpha: 0.75)
+            cellView.mainBox.fillColor = NSColor.km_init(hex: "#0A82FF", alpha: 0.75)
             cellView.isSelect = true
         } else {
             cellView.isSelect = false

+ 10 - 10
PDF Office/PDF Master/Class/Home/ViewController/KMAIOpenPDFFilesVC.swift

@@ -44,34 +44,34 @@ class KMAIOpenPDFFilesVC: NSViewController {
     // MARK: initialize
     
     func initializeUI() -> Void {
-        self.openPDFFilesLabel.textColor = NSColor(hex: "#252629")
+        self.openPDFFilesLabel.textColor = NSColor.km_init(hex: "#252629")
         self.openPDFFilesLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         self.openPDFFilesImageView.image = NSImage(named: "icon_empty_addFiles")
         self.selectYourFilesBox.cornerRadius = 4.0
-        self.selectYourFilesBox.fillColor = NSColor(hex: "#1770F4")
-        self.selectYourFilesLabel.textColor = NSColor(hex: "#FFFFFF")
+        self.selectYourFilesBox.fillColor = NSColor.km_init(hex: "#1770F4")
+        self.selectYourFilesLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
         self.selectYourFilesLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.selectYourFilesImageView.image = NSImage(named: "icon_SelectYourFiles")
-        self.orDropFilesHereToOpenLabel.textColor = NSColor(hex: "#616469")
+        self.orDropFilesHereToOpenLabel.textColor = NSColor.km_init(hex: "#616469")
         self.orDropFilesHereToOpenLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.creatPDFLabel.textColor = NSColor(hex: "#252629")
+        self.creatPDFLabel.textColor = NSColor.km_init(hex: "#252629")
         self.creatPDFLabel.font = NSFont.SFProTextSemiboldFont(20.0)
-        self.newFromFilesLabel.textColor = NSColor(hex: "#252629")
+        self.newFromFilesLabel.textColor = NSColor.km_init(hex: "#252629")
         self.newFromFilesLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.newFromFilesImageView.image = NSImage(named: "icon_empty_NewFromFiles")
-        self.newBlankPageLabel.textColor = NSColor(hex: "#252629")
+        self.newBlankPageLabel.textColor = NSColor.km_init(hex: "#252629")
         self.newBlankPageLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.newBlankPageImageView.image = NSImage(named: "icon_empty_NewBlackPage")
-        self.importFromScannerLabel.textColor = NSColor(hex: "#252629")
+        self.importFromScannerLabel.textColor = NSColor.km_init(hex: "#252629")
         self.importFromScannerLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.importFromScannerImageView.image = NSImage(named: "icon_empty_ImportFromScanner")
         
         self.selectYourFilesBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if mouseEntered {
-                self.selectYourFilesBox.fillColor = NSColor(hex: "#3F8FF6")
+                self.selectYourFilesBox.fillColor = NSColor.km_init(hex: "#3F8FF6")
             } else {
-                self.selectYourFilesBox.fillColor = NSColor(hex: "#1770F4")
+                self.selectYourFilesBox.fillColor = NSColor.km_init(hex: "#1770F4")
             }
         }
         self.selectYourFilesBox.downCallback = { [unowned self](downEntered: Bool, mouseBox: KMBox, event) -> Void in

+ 62 - 62
PDF Office/PDF Master/Class/Home/ViewController/KMAIRewritingVC.swift

@@ -61,31 +61,31 @@ class KMAIRewritingVC: NSViewController {
     // MARK: initialize
     
     func initializeUI() -> Void {
-        self.aiRewritingLabel.textColor = NSColor(hex: "#252629")
+        self.aiRewritingLabel.textColor = NSColor.km_init(hex: "#252629")
         self.aiRewritingLabel.font = NSFont.SFProTextSemiboldFont(20.0)
-        self.aiRewritingSubLabel.textColor = NSColor(hex: "#94989C")
+        self.aiRewritingSubLabel.textColor = NSColor.km_init(hex: "#94989C")
         self.aiRewritingSubLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.rewritingBox.fillColor = NSColor(hex: "#BDDFFD")
+        self.rewritingBox.fillColor = NSColor.km_init(hex: "#BDDFFD")
         self.rewritingBox.cornerRadius = 4.0
-        self.rewritingLabel.textColor = NSColor(hex: "#F7F8FA")
+        self.rewritingLabel.textColor = NSColor.km_init(hex: "#F7F8FA")
         self.rewritingLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.rewritingTextBox.borderColor = NSColor(hex: "#1770F4")
-        self.wordsLabel.textColor = NSColor(hex: "#94989C")
+        self.rewritingTextBox.borderColor = NSColor.km_init(hex: "#1770F4")
+        self.wordsLabel.textColor = NSColor.km_init(hex: "#94989C")
         self.wordsLabel.font = NSFont.SFProTextRegularFont(14.0)
 
-        self.resultLabel.textColor = NSColor(hex: "#252629")
+        self.resultLabel.textColor = NSColor.km_init(hex: "#252629")
         self.resultLabel.font = NSFont.SFProTextSemiboldFont(20.0)
-        self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-        self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+        self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
         self.copyBox.cornerRadius = 4.0
         self.copyBox.borderWidth = 1.0
-        self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
+        self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
         self.copyLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.resultTextBox.borderColor = NSColor(hex: "#DFE1E5")
+        self.resultTextBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
         
         self.errorView.isHidden = true
         self.errorImageView.image = NSImage(named: "icon_error")
-        self.errorLabel.textColor = NSColor(hex: "#F3465B")
+        self.errorLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.errorLabel.font = NSFont.SFProTextRegularFont(12.0)
         
 //        if self.state == .AIRewriting {
@@ -146,78 +146,78 @@ class KMAIRewritingVC: NSViewController {
         self.copyLabel.stringValue = NSLocalizedString("Copy", comment: "")
 
         if self.uiState == .CanAIRewriting || self.uiState == .CanAIErrorCorrection {
-            self.rewritingBox.fillColor = NSColor(hex: "#1770F4")
+            self.rewritingBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.rewritingBox.borderWidth = 0.0
-            self.rewritingLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+            self.rewritingLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
-            self.wordsLabel.textColor = NSColor(hex: "#94989C")
-            self.resultTextBox.fillColor = NSColor(hex: "#FFFFFF")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
+            self.wordsLabel.textColor = NSColor.km_init(hex: "#94989C")
+            self.resultTextBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
             self.resultTextBox.borderWidth = 1.0
-            self.rewritingBox.borderColor = NSColor(hex: "#DFE1E5")
+            self.rewritingBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
             self.emptyImageView.isHidden = false
             self.errorView.isHidden = true
         } else if self.uiState == .CanCopy {
-            self.rewritingBox.fillColor = NSColor(hex: "#1770F4")
+            self.rewritingBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.rewritingBox.borderWidth = 0.0
-            self.rewritingLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#FFFFFF")
+            self.rewritingLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#252629")
-            self.wordsLabel.textColor = NSColor(hex: "#94989C")
-            self.resultTextBox.fillColor = NSColor(hex: "#FFFFFF")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#252629")
+            self.wordsLabel.textColor = NSColor.km_init(hex: "#94989C")
+            self.resultTextBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
             self.resultTextBox.borderWidth = 1.0
-            self.rewritingBox.borderColor = NSColor(hex: "#DFE1E5")
+            self.rewritingBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
             self.emptyImageView.isHidden = true
             self.errorView.isHidden = true
         } else if self.uiState == .Copyed {
-            self.rewritingBox.fillColor = NSColor(hex: "#1770F4")
+            self.rewritingBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.rewritingBox.borderWidth = 0.0
-            self.rewritingLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#36383B")
+            self.rewritingLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#36383B")
             self.copyBox.borderWidth = 0.0
-            self.copyLabel.textColor = NSColor(hex: "#FFFFFF")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
             self.copyLabel.stringValue = NSLocalizedString("Copied", comment: "")
-            self.wordsLabel.textColor = NSColor(hex: "#94989C")
-            self.resultTextBox.fillColor = NSColor(hex: "#FFFFFF")
+            self.wordsLabel.textColor = NSColor.km_init(hex: "#94989C")
+            self.resultTextBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
             self.resultTextBox.borderWidth = 1.0
-            self.rewritingBox.borderColor = NSColor(hex: "#DFE1E5")
+            self.rewritingBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
             self.emptyImageView.isHidden = true
             self.errorView.isHidden = true
         } else if self.uiState == .Exceed { // 是否超过
-            self.rewritingBox.fillColor = NSColor(hex: "#1770F4")
+            self.rewritingBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.rewritingBox.borderWidth = 0.0
-            self.rewritingLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+            self.rewritingLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
-            self.wordsLabel.textColor = NSColor(hex: "#F3465B")
-            self.resultTextBox.fillColor = NSColor(hex: "#FFFFFF")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
+            self.wordsLabel.textColor = NSColor.km_init(hex: "#F3465B")
+            self.resultTextBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
             self.resultTextBox.borderWidth = 1.0
-            self.rewritingBox.borderColor = NSColor(hex: "#F3465B")
+            self.rewritingBox.borderColor = NSColor.km_init(hex: "#F3465B")
             self.emptyImageView.isHidden = true
             self.errorView.isHidden = false
             self.errorLabel.stringValue = NSLocalizedString("Limit to 150 characters at a time", comment: "")
         } else if self.uiState == .Error {
-            self.rewritingBox.fillColor = NSColor(hex: "#1770F4")
+            self.rewritingBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.rewritingBox.borderWidth = 0.0
-            self.rewritingLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+            self.rewritingLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
             if self.rewritingTextField.stringValue.count > 150 {
-                self.wordsLabel.textColor = NSColor(hex: "#F3465B")
+                self.wordsLabel.textColor = NSColor.km_init(hex: "#F3465B")
             } else {
-                self.wordsLabel.textColor = NSColor(hex: "#94989C")
+                self.wordsLabel.textColor = NSColor.km_init(hex: "#94989C")
             }
-            self.resultTextBox.fillColor = NSColor(hex: "#FFFFFF")
+            self.resultTextBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
             self.resultTextBox.borderWidth = 1.0
-            self.rewritingBox.borderColor = NSColor(hex: "#F3465B")
+            self.rewritingBox.borderColor = NSColor.km_init(hex: "#F3465B")
             self.emptyImageView.isHidden = true
             self.errorView.isHidden = false
             if self.state == .AIRewriting {
@@ -226,17 +226,17 @@ class KMAIRewritingVC: NSViewController {
                 self.errorLabel.stringValue = self.aiErrorCorrectionErrorStr
             }
         } else {
-            self.rewritingBox.fillColor = NSColor(hex: "#BDDFFD")
+            self.rewritingBox.fillColor = NSColor.km_init(hex: "#BDDFFD")
             self.rewritingBox.borderWidth = 0.0
-            self.rewritingLabel.textColor = NSColor(hex: "#F7F8FA")
-            self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+            self.rewritingLabel.textColor = NSColor.km_init(hex: "#F7F8FA")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
-            self.wordsLabel.textColor = NSColor(hex: "#94989C")
-            self.resultTextBox.fillColor = NSColor(hex: "#FFFFFF")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
+            self.wordsLabel.textColor = NSColor.km_init(hex: "#94989C")
+            self.resultTextBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
             self.resultTextBox.borderWidth = 1.0
-            self.rewritingBox.borderColor = NSColor(hex: "#DFE1E5")
+            self.rewritingBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
             self.emptyImageView.isHidden = false
             self.errorView.isHidden = true
         }
@@ -311,9 +311,9 @@ class KMAIRewritingVC: NSViewController {
         } else if self.state == . AIErrorCorrection {
             progress.message = NSLocalizedString("Error Correcting...", comment: "")
         }
-        progress.window?.backgroundColor = NSColor(hex: "#36383B")
+        progress.window?.backgroundColor = NSColor.km_init(hex: "#36383B")
         progress.window?.contentView?.wantsLayer = true
-        progress.window?.contentView?.layer?.backgroundColor = NSColor(hex: "#36383B").cgColor
+        progress.window?.contentView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
         progress.progressField.textColor = NSColor.white
         
         progress.closeBlock = { [unowned self] in

+ 17 - 17
PDF Office/PDF Master/Class/Home/ViewController/KMAITranslationVC.swift

@@ -59,25 +59,25 @@ class KMAITranslationVC: NSViewController {
     func initializeUI() -> Void {
         self.aiTranslationView.canHover = false
 
-        self.aiTranslationLabel.textColor = NSColor(hex: "#252629")
+        self.aiTranslationLabel.textColor = NSColor.km_init(hex: "#252629")
         self.aiTranslationLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         
         self.supportPDFWordFileImageView.image = NSImage(named: "ic_function_other")
-        self.supportPDFWordFileLabel.textColor = NSColor(hex: "#252629")
+        self.supportPDFWordFileLabel.textColor = NSColor.km_init(hex: "#252629")
         self.supportPDFWordFileLabel.font = NSFont.SFProTextSemiboldFont(20.0)
-        self.supportPDFWordFileSubLabel.textColor = NSColor(hex: "#94989C")
+        self.supportPDFWordFileSubLabel.textColor = NSColor.km_init(hex: "#94989C")
         self.supportPDFWordFileSubLabel.font = NSFont.SFProTextRegularFont(14.0)
 
-        self.translationLanguageLabel.textColor = NSColor(hex: "#252629")
+        self.translationLanguageLabel.textColor = NSColor.km_init(hex: "#252629")
         self.translationLanguageLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.automaticLabel.textColor = NSColor(hex: "#252629")
+        self.automaticLabel.textColor = NSColor.km_init(hex: "#252629")
         self.automaticLabel.font = NSFont.SFProTextRegularFont(16.0)
-        self.languageLabel.textColor = NSColor(hex: "#252629")
+        self.languageLabel.textColor = NSColor.km_init(hex: "#252629")
         self.languageLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.automaticBox.cornerRadius = 4.0
-        self.automaticBox.borderColor = NSColor(hex: "#DFE1E5")
+        self.automaticBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
         self.languageBox.cornerRadius = 4.0
-        self.languageBox.borderColor = NSColor(hex: "#DFE1E5")
+        self.languageBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
         self.languageImageView.image = NSImage(named: "ic_transtate")
         self.automaticBox.downCallback = { [unowned self](downEntered: Bool, mouseBox: KMBox, event) -> Void in
             if downEntered {
@@ -91,19 +91,19 @@ class KMAITranslationVC: NSViewController {
         }
 
         self.selectYourFilesBox.cornerRadius = 4.0
-        self.selectYourFilesBox.fillColor = NSColor(hex: "#1770F4")
-        self.selectYourFilesLabel.textColor = NSColor(hex: "#FFFFFF")
+        self.selectYourFilesBox.fillColor = NSColor.km_init(hex: "#1770F4")
+        self.selectYourFilesLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
         self.selectYourFilesLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.selectYourFilesImageView.image = NSImage(named: "icon_SelectYourFiles")
         
-        self.orDropFileHereLabel.textColor = NSColor(hex: "#616469")
+        self.orDropFileHereLabel.textColor = NSColor.km_init(hex: "#616469")
         self.orDropFileHereLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.selectYourFilesBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if mouseEntered {
-                self.selectYourFilesBox.fillColor = NSColor(hex: "#3F8FF6")
+                self.selectYourFilesBox.fillColor = NSColor.km_init(hex: "#3F8FF6")
             } else {
-                self.selectYourFilesBox.fillColor = NSColor(hex: "#1770F4")
+                self.selectYourFilesBox.fillColor = NSColor.km_init(hex: "#1770F4")
             }
         }
         self.selectYourFilesBox.downCallback = { [unowned self](downEntered: Bool, mouseBox: KMBox, event) -> Void in
@@ -134,9 +134,9 @@ class KMAITranslationVC: NSViewController {
         
         self.errorView.isHidden = true
         self.errorView.wantsLayer = true
-        self.errorView.layer?.backgroundColor = NSColor(hex: "##36383B").cgColor
+        self.errorView.layer?.backgroundColor = NSColor.km_init(hex: "##36383B").cgColor
         self.errorView.layer?.cornerRadius = 4.0
-        self.errorLabel.textColor = NSColor(hex: "#FFFFFF")
+        self.errorLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
         self.errorLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
@@ -403,9 +403,9 @@ class KMAITranslationVC: NSViewController {
     func showProgressWindow() {
         let progress = SKProgressController()
         progress.message = NSLocalizedString("Translating...", comment: "")
-        progress.window?.backgroundColor = NSColor(hex: "#36383B")
+        progress.window?.backgroundColor = NSColor.km_init(hex: "#36383B")
         progress.window?.contentView?.wantsLayer = true
-        progress.window?.contentView?.layer?.backgroundColor = NSColor(hex: "#36383B").cgColor
+        progress.window?.contentView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
         progress.progressField.textColor = NSColor.white
         
         progress.closeBlock = { [unowned self] in

+ 6 - 6
PDF Office/PDF Master/Class/Home/ViewController/KMFastToolCollectionViewItem.swift

@@ -344,14 +344,14 @@ class KMFastToolCollectionViewItem: NSCollectionViewItem {
         self.isCustomize = customize
         if isCustomize {
             fastToolItemBox.isDottedLine = true
-            fastToolItemBox.fillColor = NSColor(hex: "#F7F8FA")
-            fastToolIteTitleLabel.textColor = NSColor(hex: "#252629")
-            fastToolItemSubtitleLabel.textColor = NSColor(hex: "#616469")
+            fastToolItemBox.fillColor = NSColor.km_init(hex: "#F7F8FA")
+            fastToolIteTitleLabel.textColor = NSColor.km_init(hex: "#252629")
+            fastToolItemSubtitleLabel.textColor = NSColor.km_init(hex: "#616469")
         } else {
             fastToolItemBox.isDottedLine = false
-            fastToolItemBox.fillColor = NSColor(hex: "#FFFFFF")
-            fastToolIteTitleLabel.textColor =  NSColor(hex: "#252629")
-            fastToolItemSubtitleLabel.textColor = NSColor(hex: "#616469")
+            fastToolItemBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
+            fastToolIteTitleLabel.textColor =  NSColor.km_init(hex: "#252629")
+            fastToolItemSubtitleLabel.textColor = NSColor.km_init(hex: "#616469")
         }
     }
     

+ 6 - 6
PDF Office/PDF Master/Class/Home/ViewController/KMHistoryFileCollectionViewItem.swift

@@ -34,14 +34,14 @@ class KMHistoryFileCollectionViewItem: NSCollectionViewItem {
         mainBox.moveCallback =  { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if !self.isSelect {
                 if mouseEntered {
-                    self.mainBox.fillColor = NSColor(hex: "#EDEEF0")
+                    self.mainBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
                     self.mainBox.borderWidth = 0.0
-                    self.documentName.textColor = NSColor(hex: "#252629")
+                    self.documentName.textColor = NSColor.km_init(hex: "#252629")
                     self.mainBox.cornerRadius = 8.0
                 } else {
                     self.mainBox.fillColor = .clear
                     self.mainBox.borderWidth = 0.0
-                    self.documentName.textColor = NSColor(hex: "#252629")
+                    self.documentName.textColor = NSColor.km_init(hex: "#252629")
                     self.mainBox.cornerRadius = 0.0
                 }
             }
@@ -59,9 +59,9 @@ class KMHistoryFileCollectionViewItem: NSCollectionViewItem {
         
         if selectUrls.contains(path) {
             isSelect = true
-            mainBox.fillColor = NSColor(hex: "#CED0D4", alpha: 0.6)
+            mainBox.fillColor = NSColor.km_init(hex: "#CED0D4", alpha: 0.6)
             mainBox.borderWidth = 1.0
-            mainBox.borderColor = NSColor(hex: "#CED0D4")
+            mainBox.borderColor = NSColor.km_init(hex: "#CED0D4")
             mainBox.cornerRadius = 8.0
         } else {
             isSelect = false
@@ -72,7 +72,7 @@ class KMHistoryFileCollectionViewItem: NSCollectionViewItem {
         favoriteButton.isHidden = true
         imageBox.fillColor = .clear
         
-        documentName.textColor = NSColor(hex: "#252629")
+        documentName.textColor = NSColor.km_init(hex: "#252629")
         
         documentName.stringValue = filePathUrl!.lastPathComponent
         mainBox.toolTip = filePathUrl!.lastPathComponent

+ 1 - 1
PDF Office/PDF Master/Class/Home/ViewController/KMHomeFastToolViewController.swift

@@ -66,7 +66,7 @@ class KMHomeFastToolViewController: NSViewController {
     
     func initializeUI() {
         fastToolLabel.font = NSFont(name: "SFProText-Semibold", size: 20)
-        fastToolLabel.textColor = NSColor.init(hex: "#252629")
+        fastToolLabel.textColor = NSColor.km_init(hex: "#252629")
         
         fastToolAllToolsBox.fillColor = .clear
         fastToolAllToolsBox.contentView = fastToolAllToolsButtonVC.view

+ 19 - 19
PDF Office/PDF Master/Class/Home/ViewController/KMHomeHistoryFileViewController.swift

@@ -42,18 +42,18 @@ class KMHomeHistoryFileTableviewCell: NSTableCellView {
         mainBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if !self.isSelect {
                 if mouseEntered {
-                    self.documentName.textColor = NSColor(hex: "#252629")
-                    self.documentType.textColor = NSColor(hex: "#94989C")
-                    self.documentSize.textColor = NSColor(hex: "#94989C")
-                    self.lastModificationTime.textColor = NSColor(hex: "#94989C")
-                    self.mainBox.fillColor = NSColor(hex: "#EDEEF0")
+                    self.documentName.textColor = NSColor.km_init(hex: "#252629")
+                    self.documentType.textColor = NSColor.km_init(hex: "#94989C")
+                    self.documentSize.textColor = NSColor.km_init(hex: "#94989C")
+                    self.lastModificationTime.textColor = NSColor.km_init(hex: "#94989C")
+                    self.mainBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
                     self.mainBox.borderWidth = 0
                     self.mainBox.cornerRadius = 4.0
                 } else {
-                    self.documentName.textColor = NSColor(hex: "#252629")
-                    self.documentType.textColor = NSColor(hex: "#94989C")
-                    self.documentSize.textColor = NSColor(hex: "#94989C")
-                    self.lastModificationTime.textColor = NSColor(hex: "#94989C")
+                    self.documentName.textColor = NSColor.km_init(hex: "#252629")
+                    self.documentType.textColor = NSColor.km_init(hex: "#94989C")
+                    self.documentSize.textColor = NSColor.km_init(hex: "#94989C")
+                    self.lastModificationTime.textColor = NSColor.km_init(hex: "#94989C")
                     self.mainBox.fillColor = .clear
                     self.mainBox.borderWidth = 0
                     self.mainBox.cornerRadius = 0.0
@@ -104,9 +104,9 @@ class KMHomeHistoryFileTableviewCell: NSTableCellView {
             
             if selectUrls.contains(url) {
                 isSelect = true
-                mainBox.fillColor = NSColor(hex: "#CED0D4", alpha: 0.6)
+                mainBox.fillColor = NSColor.km_init(hex: "#CED0D4", alpha: 0.6)
                 mainBox.borderWidth = 1.0
-                mainBox.borderColor = NSColor(hex: "#CED0D4")
+                mainBox.borderColor = NSColor.km_init(hex: "#CED0D4")
                 mainBox.cornerRadius = 4.0
             } else {
                 isSelect = false
@@ -115,12 +115,12 @@ class KMHomeHistoryFileTableviewCell: NSTableCellView {
                 mainBox.cornerRadius = 0.0
             }
             documentName.backgroundColor = .clear
-            documentName.textColor = NSColor(hex: "#252629")
+            documentName.textColor = NSColor.km_init(hex: "#252629")
             documentName.font = NSFont(name: "SFProText-Regular", size: 14)
-            documentType.textColor = NSColor(hex: "#94989C")
-            documentSize.textColor = NSColor(hex: "#94989C")
+            documentType.textColor = NSColor.km_init(hex: "#94989C")
+            documentSize.textColor = NSColor.km_init(hex: "#94989C")
             documentName.backgroundColor = .clear
-            lastModificationTime.textColor = NSColor(hex: "#94989C")
+            lastModificationTime.textColor = NSColor.km_init(hex: "#94989C")
             lastModificationTime.backgroundColor = .clear
             moreButton.image = NSImage(named: "KMHomeMoreTools")
             let image: NSImage = NSImage.previewForFile(path: url, ofSize: fileImageView.frame.size, asIcon: true) ?? NSImage()
@@ -131,9 +131,9 @@ class KMHomeHistoryFileTableviewCell: NSTableCellView {
     func highlightCell(_ rows: Array<Int>, _ row: Int) -> Void {
         for i in rows {
             if i == row {
-                mainBox.fillColor = NSColor(hex: "#CED0D4", alpha: 0.6)
+                mainBox.fillColor = NSColor.km_init(hex: "#CED0D4", alpha: 0.6)
                 mainBox.borderWidth = 1.0
-                mainBox.borderColor = NSColor(hex: "#CED0D4")
+                mainBox.borderColor = NSColor.km_init(hex: "#CED0D4")
             }
         }
     }
@@ -388,9 +388,9 @@ class KMHomeHistoryFileViewController: NSViewController, NSCollectionViewDelegat
         modeBox.cornerRadius = KMDesignToken.shared.borderRadius(withToken: "segmented.bg").stringToCGFloat()
         
         emptyImageView.image = NSImage(named: "icon_empty_add_norm")
-        emptyTitleLabel.textColor = NSColor(hex: "#616469")
+        emptyTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         emptyTitleLabel.font = NSFont(name: "SFProText-Regular", size: 14.0)
-        emptySubtitleLabel.textColor = NSColor(hex: "#94989C")
+        emptySubtitleLabel.textColor = NSColor.km_init(hex: "#94989C")
         emptySubtitleLabel.font = NSFont(name: "SFProText-Regular", size: 12.0)
     }
     

+ 3 - 3
PDF Office/PDF Master/Class/Home/ViewController/KMHomePopViewController.swift

@@ -52,7 +52,7 @@ typealias popCellViewDownCallback = (_ downEntered: Bool, _ count: String) -> Vo
     override func viewDidLoad() {
         super.viewDidLoad()
             
-        customBox.fillColor = NSColor(hex: "#FFFFFF")
+        customBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
 
 //        self.updateUI()
     }
@@ -193,7 +193,7 @@ typealias popCellViewDownCallback = (_ downEntered: Bool, _ count: String) -> Vo
         boxLabel.font = NSFont.systemFont(ofSize: 14.0)
         boxLabel.translatesAutoresizingMaskIntoConstraints = false
         boxLabel.backgroundColor = NSColor.clear
-        boxLabel.textColor = NSColor(hex: "#252629")
+        boxLabel.textColor = NSColor.km_init(hex: "#252629")
         box.contentView?.addSubview(boxLabel)
         boxLabel.mas_makeConstraints { (make) in
             make?.centerY.equalTo()(0.0)
@@ -279,7 +279,7 @@ typealias popCellViewDownCallback = (_ downEntered: Bool, _ count: String) -> Vo
         label.font = NSFont.systemFont(ofSize: 14.0)
         label.translatesAutoresizingMaskIntoConstraints = false
         label.backgroundColor = NSColor.clear
-        label.textColor = NSColor(hex: "#252629")
+        label.textColor = NSColor.km_init(hex: "#252629")
         return label
     }
 }

+ 1 - 1
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+UI.swift

@@ -45,7 +45,7 @@ extension KMHomeViewController {
 //                    paragraphStyle.lineSpacing = 22.0
 //                    subLabel.attributedStringValue = NSAttributedString(string: dict["Name"]! as String, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle])
 //                    subLabel.font = NSFont(name: "SFProText-Regular", size: 14)
-//                    subLabel.textColor = NSColor(hex: "#616469")
+//                    subLabel.textColor = NSColor.km_init(hex: "#616469")
 //                    subLabel.sizeToFit()
 //                    subBox.addSubview(subLabel)
 //                    subLabel.mas_makeConstraints { (make) in

+ 18 - 18
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -147,7 +147,7 @@ import KMAdvertisement
         pdfOthersButtonVC = KMTextImageButtonVC.init(nibName: "KMTextImageButtonVC", bundle: nil)
 
         self.homeSplitView.setPosition(270.0, ofDividerAt: 0)
-        self.leftBox.fillColor = NSColor(hex: "#F7F8FA")
+        self.leftBox.fillColor = NSColor.km_init(hex: "#F7F8FA")
         
         self.productPromotionPDFProSeries = ["Windows", "iPhone / iPad", "Android"]
         self.productPromotionOthers = ["ComPDFKit", "SignFlow", "FiImage Editor", "FiImage Screen", "Free PDF Templates"]
@@ -368,12 +368,12 @@ import KMAdvertisement
         self.aiHomeBox.cornerRadius = 8.0
         self.aiHomeImageView.image = NSImage(named: "icon_home")
         self.aiHomeLabel.stringValue = NSLocalizedString("Home", comment: "")
-        self.aiHomeLabel.textColor = NSColor(hex: "#252629")
+        self.aiHomeLabel.textColor = NSColor.km_init(hex: "#252629")
         self.aiHomeLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiHomeBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if aiHomeState != .Home {
                 if mouseEntered {
-                    self.aiHomeBox.fillColor = NSColor(hex: "#EDEEF0")
+                    self.aiHomeBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
                 } else {
                     self.aiHomeBox.fillColor = .clear
                 }
@@ -393,12 +393,12 @@ import KMAdvertisement
         self.aiTranslationBox.cornerRadius = 8.0
         self.aiTranslationImageView.image = NSImage(named: "ic_function_other")
         self.aiTranslationLabel.stringValue = NSLocalizedString("AI Translation", comment: "")
-        self.aiTranslationLabel.textColor = NSColor(hex: "#252629")
+        self.aiTranslationLabel.textColor = NSColor.km_init(hex: "#252629")
         self.aiTranslationLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiTranslationBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if aiHomeState != .AITranslation {
                 if mouseEntered {
-                    self.aiTranslationBox.fillColor = NSColor(hex: "#EDEEF0")
+                    self.aiTranslationBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
                 } else {
                     self.aiTranslationBox.fillColor = .clear
                 }
@@ -420,12 +420,12 @@ import KMAdvertisement
         self.aiRewritingBox.cornerRadius = 8.0
         self.aiRewritingImageView.image = NSImage(named: "ic_ai_Rewriting")
         self.aiRewritingLabel.stringValue = NSLocalizedString("AI Rewriting", comment: "")
-        self.aiRewritingLabel.textColor = NSColor(hex: "#252629")
+        self.aiRewritingLabel.textColor = NSColor.km_init(hex: "#252629")
         self.aiRewritingLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiRewritingBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if aiHomeState != .AIRewriting {
                 if mouseEntered {
-                    self.aiRewritingBox.fillColor = NSColor(hex: "#EDEEF0")
+                    self.aiRewritingBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
                 } else {
                     self.aiRewritingBox.fillColor = .clear
                 }
@@ -447,12 +447,12 @@ import KMAdvertisement
         self.aiErrorCorrectionBox.cornerRadius = 8.0
         self.aiErrorCorrectionImageView.image = NSImage(named: "ic_ai_ErrorCorrection")
         self.aiErrorCorrectionLabel.stringValue = NSLocalizedString("AI Error Correction", comment: "")
-        self.aiErrorCorrectionLabel.textColor = NSColor(hex: "#252629")
+        self.aiErrorCorrectionLabel.textColor = NSColor.km_init(hex: "#252629")
         self.aiErrorCorrectionLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiErrorCorrectionBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if aiHomeState != .AIErrorCorrection {
                 if mouseEntered {
-                    self.aiErrorCorrectionBox.fillColor = NSColor(hex: "#EDEEF0")
+                    self.aiErrorCorrectionBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
                 } else {
                     self.aiErrorCorrectionBox.fillColor = .clear
                 }
@@ -539,7 +539,7 @@ import KMAdvertisement
 
         switch self.aiHomeState {
         case .Home:
-            self.aiHomeBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
+            self.aiHomeBox.fillColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1)
             self.aiHomeLabel.font = NSFont.SFProTextSemiboldFont(16.0)
             
             self.rightTopBox.isHidden = false
@@ -553,8 +553,8 @@ import KMAdvertisement
             self.dragView.isHidden = false
             break
         case .AITranslation:
-            self.aiTranslationBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
-            self.aiTranslationLabel.textColor = NSColor(hex: "#252629")
+            self.aiTranslationBox.fillColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1)
+            self.aiTranslationLabel.textColor = NSColor.km_init(hex: "#252629")
             self.aiTranslationLabel.font = NSFont.SFProTextSemiboldFont(16.0)
 
             self.rightFullBox.isHidden = false
@@ -565,8 +565,8 @@ import KMAdvertisement
             self.dragView.isHidden = false
             break
         case .AIRewriting:
-            self.aiRewritingBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
-            self.aiRewritingLabel.textColor = NSColor(hex: "#252629")
+            self.aiRewritingBox.fillColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1)
+            self.aiRewritingLabel.textColor = NSColor.km_init(hex: "#252629")
             self.aiRewritingLabel.font = NSFont.SFProTextSemiboldFont(16.0)
 
             self.rightFullBox.isHidden = false
@@ -580,8 +580,8 @@ import KMAdvertisement
             self.dragView.isHidden = true
             break
         case .AIErrorCorrection:
-            self.aiErrorCorrectionBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
-            self.aiErrorCorrectionLabel.textColor = NSColor(hex: "#252629")
+            self.aiErrorCorrectionBox.fillColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1)
+            self.aiErrorCorrectionLabel.textColor = NSColor.km_init(hex: "#252629")
             self.aiErrorCorrectionLabel.font = NSFont.SFProTextSemiboldFont(16.0)
 
             self.rightFullBox.isHidden = false
@@ -624,9 +624,9 @@ import KMAdvertisement
     func showProgressWindow() {
         let progress = SKProgressController()
         progress.message = NSLocalizedString("Translating...", comment: "")
-        progress.window?.backgroundColor = NSColor(hex: "#36383B")
+        progress.window?.backgroundColor = NSColor.km_init(hex: "#36383B")
         progress.window?.contentView?.wantsLayer = true
-        progress.window?.contentView?.layer?.backgroundColor = NSColor(hex: "#36383B").cgColor
+        progress.window?.contentView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
         progress.progressField.textColor = NSColor.white
         
         progress.closeBlock = { [unowned self] in

+ 3 - 3
PDF Office/PDF Master/Class/Home/ViewController/KMPDFToolsViewController.swift

@@ -124,12 +124,12 @@ class KMPDFToolsViewController: NSViewController {
         foldOrUnflodVC.action = #selector(foldOrUnflodButtonAction(_:))
         foldOrUnflodVC.button(type: .Sec, size: .m, height: foldOrUnflodBoxHeight)
 
-        pdfToolLabel.textColor = NSColor(hex: "#000000")
+        pdfToolLabel.textColor = NSColor.km_init(hex: "#000000")
         pdfToolLabel.font = NSFont(name: "PingFangSC-Semibold", size: 16.0)
         homeFastToolLabel.font = NSFont(name: "SFProText-Semibold", size: 14.0)
-        homeFastToolLabel.textColor = NSColor(hex: "#616469")
+        homeFastToolLabel.textColor = NSColor.km_init(hex: "#616469")
         moreToolLabel.font = NSFont(name: "SFProText-Semibold", size: 14.0)
-        moreToolLabel.textColor = NSColor(hex: "#616469")
+        moreToolLabel.textColor = NSColor.km_init(hex: "#616469")
         
         confirmBox.fillColor = .clear
         confirmBox.contentView = confirmVC.view

+ 2 - 2
PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignPropertySelector.swift

@@ -25,7 +25,7 @@ class KMDesignPropertyColorBox: NSBox {
             let endPoint = NSPoint(x: dirtyRect.width-3, y: dirtyRect.height-3)
             path.line(to: endPoint)
             // Draw the path
-            NSColor(hex: "#F3465B").setStroke()
+            NSColor.km_init(hex: "#F3465B").setStroke()
             path.lineWidth = 1
             path.stroke()
         }
@@ -73,7 +73,7 @@ class KMDesignPropertySelector: KMDesignBase {
             self.mainBox.contentView = colorIconView
             self.iconBox.cornerRadius = iconBoxWidth_spacing.constant/2
             self.iconBox.borderWidth = 1.0
-            self.iconBox.borderColor = NSColor(hex: "#000000", alpha: 0.1)
+            self.iconBox.borderColor = NSColor.km_init(hex: "#000000", alpha: 0.1)
             
             self.propertySelector(bg: "property-selector.icon-btn.bg.norm")
             self.propertySelector(bg: "property-selector.icon-btn.bg.hov", state: .Hov)

+ 17 - 17
PDF Office/PDF Master/Class/Home/WindowController/KMAITranslationConfirmWindowController.swift

@@ -62,39 +62,39 @@ class KMAITranslationConfirmWindowController: NSWindowController {
     }
     
     func initializeUI() -> Void {
-        self.label.textColor = NSColor(hex: "#252629")
+        self.label.textColor = NSColor.km_init(hex: "#252629")
         self.label.font = NSFont.SFProTextSemiboldFont(16.0)
         
-        self.subLabel.textColor = NSColor(hex: "##616469")
+        self.subLabel.textColor = NSColor.km_init(hex: "##616469")
         self.subLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.fromBox.fillColor = NSColor(hex: "#FFFFFF")
-        self.fromBox.borderColor = NSColor(hex: "#DFE1E5")
-        self.fromLabel.textColor = NSColor(hex: "#252629")
+        self.fromBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
+        self.fromBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        self.fromLabel.textColor = NSColor.km_init(hex: "#252629")
         self.fromLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.toBox.fillColor = NSColor(hex: "#FFFFFF")
-        self.toBox.borderColor = NSColor(hex: "#DFE1E5")
-        self.toLabel.textColor = NSColor(hex: "#252629")
+        self.toBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
+        self.toBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        self.toLabel.textColor = NSColor.km_init(hex: "#252629")
         self.toLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.languageImageView.image = NSImage(named: "ic_transtate")
         
-        self.tipsLabel1.textColor = NSColor(hex: "#94989C")
+        self.tipsLabel1.textColor = NSColor.km_init(hex: "#94989C")
         self.tipsLabel1.font = NSFont.SFProTextRegularFont(12.0)
-        self.tipsLabel2.textColor = NSColor(hex: "#94989C")
+        self.tipsLabel2.textColor = NSColor.km_init(hex: "#94989C")
         self.tipsLabel2.font = NSFont.SFProTextRegularFont(12.0)
 
-        self.cancelBox.fillColor = NSColor(hex: "#F5F5F5")
+        self.cancelBox.fillColor = NSColor.km_init(hex: "#F5F5F5")
         self.cancelBox.cornerRadius = 5.0
         self.cancelBox.borderWidth = 0.0
-        self.cancelLabel.textColor = NSColor(hex: "#4D4D4D")
+        self.cancelLabel.textColor = NSColor.km_init(hex: "#4D4D4D")
         self.cancelLabel.font = NSFont.SFProTextRegularFont(13.0)
-        self.translateBox.fillColor = NSColor(hex: "#4B91F7")
+        self.translateBox.fillColor = NSColor.km_init(hex: "#4B91F7")
         self.translateBox.cornerRadius = 5.0
         self.translateBox.borderWidth = 0.0
-        self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
+        self.translateLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
         self.translateLabel.font = NSFont.SFProTextRegularFont(13.0)
         
-        self.prePDFView?.backgroundColor = NSColor(hex: "#F7F8FA")
+        self.prePDFView?.backgroundColor = NSColor.km_init(hex: "#F7F8FA")
     }
     
     func initLocalization() -> Void {
@@ -279,9 +279,9 @@ class KMAITranslationConfirmWindowController: NSWindowController {
     func showProgressWindow() {
         let progress = SKProgressController()
         progress.message = NSLocalizedString("Translating...", comment: "")
-        progress.window?.backgroundColor = NSColor(hex: "#36383B")
+        progress.window?.backgroundColor = NSColor.km_init(hex: "#36383B")
         progress.window?.contentView?.wantsLayer = true
-        progress.window?.contentView?.layer?.backgroundColor = NSColor(hex: "#36383B").cgColor
+        progress.window?.contentView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
         progress.progressField.textColor = NSColor.white
         
         progress.closeBlock = { [unowned self] in

+ 58 - 58
PDF Office/PDF Master/Class/Home/WindowController/KMAITranslationWindowController.swift

@@ -71,47 +71,47 @@ class KMAITranslationWindowController: NSWindowController {
     // MARK: initialize
     
     func initializeUI() -> Void {
-        self.aiTranslationTitleLabel.textColor = NSColor(hex: "#252629")
+        self.aiTranslationTitleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.aiTranslationTitleLabel.font = NSFont.SFProTextSemiboldFont(16.0)
-        self.translationLanguage.textColor = NSColor(hex: "#252629")
+        self.translationLanguage.textColor = NSColor.km_init(hex: "#252629")
         self.translationLanguage.font = NSFont.SFProTextRegularFont(14.0)
-        self.fromBox.fillColor = NSColor(hex: "#FFFFFF")
-        self.fromBox.borderColor = NSColor(hex: "#DFE1E5")
-        self.fromLabel.textColor = NSColor(hex: "#252629")
+        self.fromBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
+        self.fromBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        self.fromLabel.textColor = NSColor.km_init(hex: "#252629")
         self.fromLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.toBox.fillColor = NSColor(hex: "#FFFFFF")
-        self.toBox.borderColor = NSColor(hex: "#DFE1E5")
-        self.toLabel.textColor = NSColor(hex: "#252629")
+        self.toBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
+        self.toBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        self.toLabel.textColor = NSColor.km_init(hex: "#252629")
         self.toLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.languageImageView.image = NSImage(named: "ic_transtate")
         
-        self.fromContentBox.borderColor = NSColor(hex: "#1770F4")
-        self.fromContentBox.fillColor = NSColor(hex: "#FFFFFF")
-        self.fromContentTextField.textColor = NSColor(hex: "#252629")
+        self.fromContentBox.borderColor = NSColor.km_init(hex: "#1770F4")
+        self.fromContentBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
+        self.fromContentTextField.textColor = NSColor.km_init(hex: "#252629")
         self.fromContentTextField.font = NSFont.SFProTextRegularFont(12.0)
-        self.fromContentLabel.textColor = NSColor(hex: "#94989C")
+        self.fromContentLabel.textColor = NSColor.km_init(hex: "#94989C")
         self.fromContentLabel.font = NSFont.SFProTextRegularFont(12.0)
 
-        self.toContentBox.borderColor = NSColor(hex: "#DFE1E5")
-        self.toContentBox.fillColor = NSColor(hex: "#FFFFFF")
+        self.toContentBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        self.toContentBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
         self.toContentTextView.textColor = .black
         self.toContentTextView.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.translateBox.fillColor = NSColor(hex: "#BDDFFD")
+        self.translateBox.fillColor = NSColor.km_init(hex: "#BDDFFD")
         self.translateBox.cornerRadius = 4.0
-        self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
+        self.translateLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
         self.translateLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
-        self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
+        self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
+        self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
         self.copyBox.borderWidth = 1.0
         self.copyBox.cornerRadius = 4.0
-        self.copyLabel.textColor = NSColor(hex: "#F7F8FA")
+        self.copyLabel.textColor = NSColor.km_init(hex: "#F7F8FA")
         self.copyLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.errorView.isHidden = true
         self.errorImageView.image = NSImage(named: "icon_error")
-        self.errorLabel.textColor = NSColor(hex: "#F3465B")
+        self.errorLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.errorLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         if self.content.count > 0 {
@@ -234,68 +234,68 @@ class KMAITranslationWindowController: NSWindowController {
         self.copyLabel.stringValue = NSLocalizedString("Copy", comment: "")
 
         if self.state == .CanTranslate {
-            self.fromContentLabel.textColor = NSColor(hex: "#94989C")
-            self.translateBox.fillColor = NSColor(hex: "#1770F4")
+            self.fromContentLabel.textColor = NSColor.km_init(hex: "#94989C")
+            self.translateBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.translateBox.borderWidth = 0.0
-            self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+            self.translateLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
             self.errorView.isHidden = true
         } else if self.state == .CanCopy {
-            self.fromContentLabel.textColor = NSColor(hex: "#94989C")
-            self.translateBox.fillColor = NSColor(hex: "#1770F4")
+            self.fromContentLabel.textColor = NSColor.km_init(hex: "#94989C")
+            self.translateBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.translateBox.borderWidth = 0.0
-            self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#FFFFFF")
+            self.translateLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#252629")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#252629")
             self.errorView.isHidden = true
         } else if self.state == .Copyed {
-            self.fromContentLabel.textColor = NSColor(hex: "#94989C")
-            self.translateBox.fillColor = NSColor(hex: "#1770F4")
+            self.fromContentLabel.textColor = NSColor.km_init(hex: "#94989C")
+            self.translateBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.translateBox.borderWidth = 0.0
-            self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#36383B")
+            self.translateLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#36383B")
             self.copyBox.borderWidth = 0.0
-            self.copyLabel.textColor = NSColor(hex: "#FFFFFF")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
             self.copyLabel.stringValue = NSLocalizedString("Copied", comment: "")
             self.errorView.isHidden = true
         } else if self.state == .Exceed { // 是否超过
-            self.fromContentLabel.textColor = NSColor(hex: "#F3465B")
-            self.translateBox.fillColor = NSColor(hex: "#1770F4")
+            self.fromContentLabel.textColor = NSColor.km_init(hex: "#F3465B")
+            self.translateBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.translateBox.borderWidth = 0.0
-            self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+            self.translateLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
             self.errorView.isHidden = true
         } else if self.state == .Error {
             if self.fromContentTextField.stringValue.count > 150 {
-                self.fromContentLabel.textColor = NSColor(hex: "#F3465B")
+                self.fromContentLabel.textColor = NSColor.km_init(hex: "#F3465B")
             } else {
-                self.fromContentLabel.textColor = NSColor(hex: "#94989C")
+                self.fromContentLabel.textColor = NSColor.km_init(hex: "#94989C")
             }
-            self.translateBox.fillColor = NSColor(hex: "#1770F4")
+            self.translateBox.fillColor = NSColor.km_init(hex: "#1770F4")
             self.translateBox.borderWidth = 0.0
-            self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
-            self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+            self.translateLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
             self.errorView.isHidden = false
         } else {
-            self.fromContentLabel.textColor = NSColor(hex: "#94989C")
-            self.translateBox.fillColor = NSColor(hex: "#BDDFFD")
+            self.fromContentLabel.textColor = NSColor.km_init(hex: "#94989C")
+            self.translateBox.fillColor = NSColor.km_init(hex: "#BDDFFD")
             self.translateBox.borderWidth = 0.0
-            self.translateLabel.textColor = NSColor(hex: "#F7F8FA")
-            self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
+            self.translateLabel.textColor = NSColor.km_init(hex: "#F7F8FA")
+            self.copyBox.fillColor = NSColor.km_init(hex: "#EDEEF0")
             self.copyBox.borderWidth = 1.0
-            self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
-            self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
+            self.copyBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+            self.copyLabel.textColor = NSColor.km_init(hex: "#B1B3B8")
             self.errorView.isHidden = true
         }
     }
@@ -303,9 +303,9 @@ class KMAITranslationWindowController: NSWindowController {
     func showProgressWindow() {
         let progress = SKProgressController()
         progress.message = NSLocalizedString("Translating...", comment: "")
-        progress.window?.backgroundColor = NSColor(hex: "#36383B")
+        progress.window?.backgroundColor = NSColor.km_init(hex: "#36383B")
         progress.window?.contentView?.wantsLayer = true
-        progress.window?.contentView?.layer?.backgroundColor = NSColor(hex: "#36383B").cgColor
+        progress.window?.contentView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
         progress.progressField.textColor = NSColor.white
         
         progress.closeBlock = { [unowned self] in

+ 1 - 1
PDF Office/PDF Master/Class/Home/WindowController/KMHistoryFileDeleteWindowController.swift

@@ -41,7 +41,7 @@ class KMHistoryFileDeleteWindowController: NSWindowController {
         deleteOptionsLabel.font = NSFont(name: "PingFangSC-Semibold", size: 15)
         deleteOptionsLabel.textColor = .black
         
-        cancelBox.fillColor = NSColor(hex: "#F5F5F5")
+        cancelBox.fillColor = NSColor.km_init(hex: "#F5F5F5")
         cancelBox.cornerRadius = 5.0
         cancelBox.contentView = cancelVC.view
         cancelVC.target = self

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/KMAccountInfoWindowController.swift

@@ -82,7 +82,7 @@ class KMAccountInfoWindowController: NSWindowController {
     }
     
     func setup() {
-        self.window?.contentView?.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.window?.contentView?.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
         self.accountInfoView.closeAction = { view in
             KMPrint("关闭")

+ 23 - 23
PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoView.swift

@@ -79,48 +79,48 @@ class KMAccountInfoView: KMBaseXibView {
     override func updateUI() {
         super.updateUI()
         
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         
-        self.accountLabel.textColor = NSColor(hex: "#252629")
+        self.accountLabel.textColor = NSColor.km_init(hex: "#252629")
         self.accountLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.accountDescribeLabel.textColor = NSColor(hex: "#616469")
+        self.accountDescribeLabel.textColor = NSColor.km_init(hex: "#616469")
         self.accountDescribeLabel.font = NSFont.SFProTextSemiboldFont(12.0)
         
-        self.imageViewButton.backgroundColor(NSColor(hex: "#1770F4"))
+        self.imageViewButton.backgroundColor(NSColor.km_init(hex: "#1770F4"))
         self.imageViewButton.font = NSFont.SFProTextSemiboldFont(28.0)
-        self.imageViewButton.contentTintColor = NSColor(hex: "#FFFFFF")
-        self.imageViewButton.border(NSColor(hex: "#1770F4"), 1, 24)
+        self.imageViewButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
+        self.imageViewButton.border(NSColor.km_init(hex: "#1770F4"), 1, 24)
         
-        self.infoContentView.backgroundColor(NSColor(hex: "#F7F8FA"))
-        self.infoContentView.border(NSColor(hex: "#F7F8FA"), 0, 6)
+        self.infoContentView.backgroundColor(NSColor.km_init(hex: "#F7F8FA"))
+        self.infoContentView.border(NSColor.km_init(hex: "#F7F8FA"), 0, 6)
         
         self.purchaseInfoButton.font = NSFont.SFProTextRegularFont(14)
-        self.purchaseInfoButton.contentTintColor = NSColor(hex: "#1770F4")
+        self.purchaseInfoButton.contentTintColor = NSColor.km_init(hex: "#1770F4")
         
 
-        self.statusTitleLabel.textColor = NSColor(hex: "#616469")
+        self.statusTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.statusTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
  
-        self.statusLabel.textColor = NSColor(hex: "#252629")
+        self.statusLabel.textColor = NSColor.km_init(hex: "#252629")
         self.statusLabel.font = NSFont.SFProTextSemiboldFont(16.0)
         
-        self.statusTimeLabel.textColor = NSColor(hex: "#616469")
+        self.statusTimeLabel.textColor = NSColor.km_init(hex: "#616469")
         self.statusTimeLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.subscribeButton.contentTintColor = NSColor(hex: "#FFFFFF")
-        self.subscribeButton.backgroundColor(NSColor(hex: "#FF852E"))
+        self.subscribeButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
+        self.subscribeButton.backgroundColor(NSColor.km_init(hex: "#FF852E"))
         self.subscribeButton.font = NSFont.SFProTextRegularFont(16)
         self.subscribeButton.border(NSColor.clear, 0, 20)
         
         self.tagLabel.font = NSFont.SFProTextRegularFont(12)
-        self.tagLabel.textColor = NSColor(hex: "#252629")
+        self.tagLabel.textColor = NSColor.km_init(hex: "#252629")
         
-        self.tagContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
-        self.tagContentView.backgroundColor(NSColor(hex: "#F7F8FA"))
+        self.tagContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
+        self.tagContentView.backgroundColor(NSColor.km_init(hex: "#F7F8FA"))
         
-        self.lineView.backgroundColor(NSColor(hex: "#ECECEC"))
+        self.lineView.backgroundColor(NSColor.km_init(hex: "#ECECEC"))
         self.updateMoreButtonState(select: false)
     }
     
@@ -139,7 +139,7 @@ class KMAccountInfoView: KMBaseXibView {
         }
          
         self.statusTimeLabel.stringValue = ""
-        self.statusLabel.textColor = NSColor(hex: "#252629")
+        self.statusLabel.textColor = NSColor.km_init(hex: "#252629")
         
         //初始化
         self.purchaseInfoContentView.isHidden = KMLightMemberManager.manager.existOrderInfo() ? false:true
@@ -188,7 +188,7 @@ class KMAccountInfoView: KMBaseXibView {
             self.purchaseInfoContentView.isHidden = true
 #endif
             self.statusLabel.stringValue = NSLocalizedString("Expired", comment: "")
-            self.statusLabel.textColor = NSColor(hex: "#F3465B")
+            self.statusLabel.textColor = NSColor.km_init(hex: "#F3465B")
             
             let dateString = userInfo?.subscriptionInfoList[0].endDate ?? ""
             self.statusTimeLabel.stringValue = "\(self.fetchDate(dateString: dateString)) \n\(NSLocalizedString("Subscription expire on", comment: ""))"
@@ -244,11 +244,11 @@ class KMAccountInfoView: KMBaseXibView {
 extension KMAccountInfoView {
     func updateMoreButtonState(select: Bool) {
         if select {
-            self.moreButton.backgroundColor(NSColor(hex: "#CED0D4", alpha: 0.6))
-            self.moreButton.border(NSColor(hex: "#CED0D4"), 1, 4)
+            self.moreButton.backgroundColor(NSColor.km_init(hex: "#CED0D4", alpha: 0.6))
+            self.moreButton.border(NSColor.km_init(hex: "#CED0D4"), 1, 4)
         } else {
             self.moreButton.backgroundColor(NSColor.clear)
-            self.moreButton.border(NSColor(hex: "#CED0D4"), 0, 4)
+            self.moreButton.border(NSColor.km_init(hex: "#CED0D4"), 0, 4)
         }
     }
 }

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/Cancellation/KMCancellationWindowController.swift

@@ -34,7 +34,7 @@ class KMCancellationWindowController: NSWindowController {
     }
     
     func setup() {
-        self.window?.contentView?.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.window?.contentView?.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
         self.cancellationSuccessView.cancelAction = { view in
             cancellationMainWindow?.endSheet(view.window!)

+ 2 - 2
PDF Office/PDF Master/Class/KMLightMember/Controller/Cancellation/View/KMCancellationSuccessView.swift

@@ -37,10 +37,10 @@ class KMCancellationSuccessView: KMBaseXibView {
         }
         
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(19.0)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.subTitleLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.subTitleLabel.textColor = NSColor(hex: "#616469")
+        self.subTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.subTitleLabel.maximumNumberOfLines = 0
         
         self.doneButtonVC = KMDesignButton(withType: .Text)

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.swift

@@ -128,7 +128,7 @@ var comparativeMainWindow: NSWindow?
     }
     
     func setup() {
-        self.window?.contentView?.backgroundColor(NSColor(hex: "FFFFFF"))
+        self.window?.contentView?.backgroundColor(NSColor.km_init(hex: "FFFFFF"))
         self.comparativeView.closeAction = { view in
             KMPrint("关闭")
             comparativeMainWindow?.endSheet(view.window!)

+ 5 - 5
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/KMComparativeOutlineView.swift

@@ -24,7 +24,7 @@ class KMComparativeOutlineView: KMBaseXibView {
     override func setup() {
         super.setup()
         
-        self.scrollView.backgroundColor(NSColor(hex: "#F2F9FF"))
+        self.scrollView.backgroundColor(NSColor.km_init(hex: "#F2F9FF"))
         
         self.outlineView.delegate = self
         self.outlineView.dataSource = self
@@ -50,10 +50,10 @@ class KMComparativeOutlineView: KMBaseXibView {
     override func updateUI() {
         super.updateUI()
         
-        self.optionTitleLabel.textColor = NSColor(hex: "#616469")
+        self.optionTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.optionTitleLabel.font = NSFont.SFProTextBoldFont(14.0)
         
-        self.optionTitleLabel2.textColor = NSColor(hex: "#616469")
+        self.optionTitleLabel2.textColor = NSColor.km_init(hex: "#616469")
         self.optionTitleLabel2.font = NSFont.SFProTextBoldFont(14.0)
     }
     
@@ -68,13 +68,13 @@ class KMComparativeOutlineView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .left
         attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextBoldFont(26.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#273C62"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#273C62"),
                                         NSAttributedString.Key.paragraphStyle : paragraphStyle],
                                     range: NSRange(location: 0, length: string.count))
         
         let range = string.range(of: NSLocalizedString("Free Use", comment: ""))
         attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextBoldFont(26.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "register://"],
                                        range: string.nsRange(from: range!)!)

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/View/KMComparativeOutlineCell.swift

@@ -106,7 +106,7 @@ class KMComparativeOutlineCell: NSTableCellView {
     }
     
     func updateUI() {
-        self.titleLabel.textColor = NSColor(hex: "#000000")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#000000")
         self.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     

+ 7 - 7
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/View/KMComparativeOutlineRowView.swift

@@ -42,13 +42,13 @@ class KMComparativeOutlineRowView: NSTableRowView {
             self.addSubview(self.box!)
 //            self.box?.moveCallback = { [unowned self] (mouseEntered, mouseBox) in
 //                if mouseEntered {
-//                    self.backgroundColor(NSColor(hex: "#CED0D4", alpha: 0.6))
+//                    self.backgroundColor(NSColor.km_init(hex: "#CED0D4", alpha: 0.6))
 //                } else {
 //                    if self.model != nil {
 //                        if model.content.count != 0 {
-//                            self.backgroundColor(NSColor(hex: "FFFFFF"))
+//                            self.backgroundColor(NSColor.km_init(hex: "FFFFFF"))
 //                        } else {
-//                            self.backgroundColor(NSColor(hex: "#F7F8FA"))
+//                            self.backgroundColor(NSColor.km_init(hex: "#F7F8FA"))
 //                        }
 //                    }
 //                }
@@ -65,7 +65,7 @@ class KMComparativeOutlineRowView: NSTableRowView {
         self.drawView()
     }
     
-    func drawView(_ color: NSColor = NSColor(hex: "#CED0D4", alpha: 0.6)) {
+    func drawView(_ color: NSColor = NSColor.km_init(hex: "#CED0D4", alpha: 0.6)) {
         color.withAlphaComponent(0.6).setFill()
         let path = NSBezierPath(roundedRect: NSInsetRect(self.bounds, 1, 1), xRadius: 0, yRadius: 0)
         path.fill()
@@ -78,7 +78,7 @@ class KMComparativeOutlineRowView: NSTableRowView {
         arrow.move(to: CGPoint(x: 16, y: 0))
         arrow.line(to: CGPoint(x: dirtyRect.width - 16, y: 0))
         arrow.close()
-        NSColor.init(hex: "#000000").withAlphaComponent(0.1).set()
+        NSColor.km_init(hex: "#000000").withAlphaComponent(0.1).set()
         arrow.stroke()
         NSColor.green.setFill()
         arrow.fill()
@@ -105,12 +105,12 @@ class KMComparativeOutlineRowView: NSTableRowView {
     func reloadData() {
 //        if self.item != nil {
 //            self.box?.frame = CGRectMake(16, 0, self.frame.size.width - 32, self.frame.size.height)
-//            self.box?.backgroundColor(NSColor(hex: "#FFFFFF"))
+//            self.box?.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
 //        }
 //
 //        if self.section != nil {
 //            self.box?.frame = CGRectMake(16, 0, self.frame.size.width - 32, self.frame.size.height)
-//            self.box?.backgroundColor(NSColor(hex: "#E4E9ED"))
+//            self.box?.backgroundColor(NSColor.km_init(hex: "#E4E9ED"))
 //        }
     }
     

+ 2 - 2
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/View/KMComparativeOutlineSectionCell.swift

@@ -51,7 +51,7 @@ class KMComparativeOutlineSectionCell: NSTableCellView {
     override func draw(_ dirtyRect: NSRect) {
         super.draw(dirtyRect)
         
-        self.contentBackgroundView.backgroundColor(NSColor(hex: "#E4E9ED"))
+        self.contentBackgroundView.backgroundColor(NSColor.km_init(hex: "#E4E9ED"))
     }
     
     func setup() {
@@ -71,7 +71,7 @@ class KMComparativeOutlineSectionCell: NSTableCellView {
     }
     
     func updateUI() {
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(14.0)
     }
     

+ 5 - 5
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeTableView.swift

@@ -58,13 +58,13 @@ class KMComparativeTableView: KMBaseXibView {
             self.waterMarkButton.isHidden = true
         }
         
-        self.backgroundColor(NSColor(hex: "#F2F9FF"))
+        self.backgroundColor(NSColor.km_init(hex: "#F2F9FF"))
         
-        self.loginButton.backgroundColor(NSColor(hex: "#1770F4"))
-        self.loginButton.border(NSColor(hex: "#1770F4"), 1, 4)
-        self.loginButton.contentTintColor = NSColor(hex: "FFFFFF")
+        self.loginButton.backgroundColor(NSColor.km_init(hex: "#1770F4"))
+        self.loginButton.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
+        self.loginButton.contentTintColor = NSColor.km_init(hex: "FFFFFF")
         
-        self.signUpButton.contentTintColor = NSColor(hex: "#1770F4")
+        self.signUpButton.contentTintColor = NSColor.km_init(hex: "#1770F4")
     }
     
     override func reloadData() {

+ 9 - 9
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/KMComparativeView.swift

@@ -130,23 +130,23 @@ class KMComparativeView: KMBaseXibView {
 //        self.textView.frame = (self.textView.enclosingScrollView?.contentView.bounds)!
 //        self.textView.autoresizingMask = [.width, .height]
         
-        self.imageView.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.imageView.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
         self.contentView.addSubview(self.imageView, positioned: .below, relativeTo: self.collectionContentView)
         self.contentView.addSubview(self.imageView, positioned: .below, relativeTo: self.topView)
         
-        self.restoreButton.contentTintColor = NSColor(hex: "#1770F4")
+        self.restoreButton.contentTintColor = NSColor.km_init(hex: "#1770F4")
         self.restoreButton.font = NSFont.SFProTextRegularFont(16)
         
-        self.privacyPolicyButton.contentTintColor = NSColor(hex: "#1770F4")
+        self.privacyPolicyButton.contentTintColor = NSColor.km_init(hex: "#1770F4")
         self.privacyPolicyButton.font = NSFont.SFProTextRegularFont(12)
         
-        self.lineView.backgroundColor(NSColor(hex: "#000000").withAlphaComponent(0.1))
+        self.lineView.backgroundColor(NSColor.km_init(hex: "#000000").withAlphaComponent(0.1))
         
-        self.termsServiceButton.contentTintColor = NSColor(hex: "#1770F4")
+        self.termsServiceButton.contentTintColor = NSColor.km_init(hex: "#1770F4")
         self.termsServiceButton.font = NSFont.SFProTextRegularFont(12)
         
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(24)
         
         self.setupPopover()
@@ -199,16 +199,16 @@ Payment will be charged to your Apple ID account at the confirmation of purchase
         popover.contentViewController = NSViewController()
         popover.contentViewController?.view = NSView(frame: NSRect(x: 0, y: 0, width: size.width, height: size.height))
         popover.contentViewController?.view.wantsLayer = true
-        popover.contentViewController?.view.layer?.backgroundColor = NSColor(hex:"#000000").cgColor
+        popover.contentViewController?.view.layer?.backgroundColor = NSColor.km_init(hex:"#000000").cgColor
         
         let textField = NSTextField(frame: NSRect(x: 16, y: 8, width: size.width - 32, height: size.height - 16))
         textField.attributedStringValue = NSMutableAttributedString(string: NSLocalizedString(string as String, comment: ""), attributes: attributes)
-        textField.backgroundColor(NSColor(hex: "#000000"))
+        textField.backgroundColor(NSColor.km_init(hex: "#000000"))
         textField.drawsBackground = false
         textField.isEditable = false
         textField.isSelectable = false
         textField.lineBreakMode = .byCharWrapping
-        textField.textColor = NSColor(hex: "#FFFFFF")
+        textField.textColor = NSColor.km_init(hex: "#FFFFFF")
         
         popover.contentViewController?.view.addSubview(textField)
     }

+ 21 - 21
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItem.swift

@@ -40,18 +40,18 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
     }
     
     func setup() {
-        self.view.border(NSColor(hex: "#E2E2E2"), 1, 10)
+        self.view.border(NSColor.km_init(hex: "#E2E2E2"), 1, 10)
         
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(20)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.subtitleLabel.font = NSFont.SFProTextSemiboldFont(32)
-        self.subtitleLabel.textColor = NSColor(hex: "#616469")
+        self.subtitleLabel.textColor = NSColor.km_init(hex: "#616469")
         
         self.describeLabel.font = NSFont.SFProTextRegularFont(14)
-        self.describeLabel.textColor = NSColor(hex: "#616469")
+        self.describeLabel.textColor = NSColor.km_init(hex: "#616469")
         
-        self.lineView.backgroundColor(NSColor(hex: "#ECECEC"))
+        self.lineView.backgroundColor(NSColor.km_init(hex: "#ECECEC"))
         
         self.scrollView.scrollerStyle = .overlay
         
@@ -67,15 +67,15 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
             if data.count != 0 {
                 if data["type"] as! Int == 1 {
                     if mouseEntered {
-                        self.doneContentView.backgroundColor(NSColor(hex: "#FFA153"))
+                        self.doneContentView.backgroundColor(NSColor.km_init(hex: "#FFA153"))
                     } else {
-                        self.doneContentView.backgroundColor(NSColor(hex: "#FF852E"))
+                        self.doneContentView.backgroundColor(NSColor.km_init(hex: "#FF852E"))
                     }
                 }  else {
                     if mouseEntered {
-                        self.doneContentView.backgroundColor(NSColor(hex: "#EDEEF0"))
+                        self.doneContentView.backgroundColor(NSColor.km_init(hex: "#EDEEF0"))
                     } else {
-                        self.doneContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
+                        self.doneContentView.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
                     }
                 }
             }
@@ -85,16 +85,16 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
             if data.count != 0 {
                 if data["type"] as! Int == 1 {
                     if mouseEntered {
-                        self.doneContentView.backgroundColor(NSColor(hex: "#D2621C"))
+                        self.doneContentView.backgroundColor(NSColor.km_init(hex: "#D2621C"))
                     } else {
-                        self.doneContentView.backgroundColor(NSColor(hex: "#FF852E"))
+                        self.doneContentView.backgroundColor(NSColor.km_init(hex: "#FF852E"))
                         self.doneAction(self.doneButton)
                     }
                 } else {
                     if mouseEntered {
-                        self.doneContentView.backgroundColor(NSColor(hex: "#DFE1E5"))
+                        self.doneContentView.backgroundColor(NSColor.km_init(hex: "#DFE1E5"))
                     } else {
-                        self.doneContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
+                        self.doneContentView.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
                         self.doneAction(self.doneButton)
                     }
                 }
@@ -131,10 +131,10 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
                 self.describeLabel.isHidden = false
                 self.iconImageView.isHidden = true
                 
-                self.subtitleLabel.textColor = NSColor(hex: "#252629")
-                self.doneContentView.backgroundColor(NSColor(hex: "#FF852E"))
-                self.doneContentView.border(NSColor(hex: "#FF852E"), 0, 20)
-                self.doneButton.textColor = NSColor(hex: "#FFFFFF")
+                self.subtitleLabel.textColor = NSColor.km_init(hex: "#252629")
+                self.doneContentView.backgroundColor(NSColor.km_init(hex: "#FF852E"))
+                self.doneContentView.border(NSColor.km_init(hex: "#FF852E"), 0, 20)
+                self.doneButton.textColor = NSColor.km_init(hex: "#FFFFFF")
                 self.doneButton.font = NSFont.SFProTextSemiboldFont(16)
                 self.describeLabel.stringValue = "Save 50% for the first year, auto-renew at $79.9. Billed yearly."
                 
@@ -144,10 +144,10 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
                 self.describeLabel.isHidden = true
                 self.iconImageView.isHidden = true
                 
-                self.subtitleLabel.textColor = NSColor(hex: "#616469")
-                self.doneContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
-                self.doneContentView.border(NSColor(hex: "#DFE1E5"), 1, 20)
-                self.doneButton.textColor = NSColor(hex: "#252629")
+                self.subtitleLabel.textColor = NSColor.km_init(hex: "#616469")
+                self.doneContentView.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
+                self.doneContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 20)
+                self.doneButton.textColor = NSColor.km_init(hex: "#252629")
                 self.doneButton.font = NSFont.SFProTextRegularFont(16)
                 if KMLightMemberManager.manager.isLogin() {
                     self.doneContentView.isHidden = true

+ 2 - 2
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItemItem.swift

@@ -20,12 +20,12 @@ class KMComparativeViewCollectionItemItem: NSCollectionViewItem {
         super.viewDidLoad()
         // Do view setup here.
         self.titleLabel.font = NSFont.SFProTextRegularFont(12)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
     }
     
     func reloadData() {
         if data.count != 0 {
-            let color = NSColor(hex: data["color"] as! String)
+            let color = NSColor.km_init(hex: data["color"] as! String)
             let state: Int = data["state"] as? Int ?? 0
             let string = NSLocalizedString(data["title"] as! String, comment: "")
             

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/KMLoginWindowController.swift

@@ -78,7 +78,7 @@ class KMLoginWindowController: NSWindowController {
     }
     
     func setup() {
-        self.window?.contentView?.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.window?.contentView?.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         KMRequestServer.requestServer.reachabilityStatusChange { [weak self] status in
             if status == .notReachable {
                 KMPrint("无网络")

+ 4 - 4
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLightNoNetworkView.swift

@@ -21,13 +21,13 @@ class KMLightNoNetworkView: KMBaseXibView {
     override func setup() {
         super.setup()
         
-        self.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
         self.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.titleLabel.textColor = NSColor(hex: "#616469")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#616469")
         
         self.subtitleLabel.font = NSFont.SFProTextRegularFont(12.0)
-        self.subtitleLabel.textColor = NSColor(hex: "#94989C")
+        self.subtitleLabel.textColor = NSColor.km_init(hex: "#94989C")
     }
     
     override func updateLanguage() {
@@ -39,7 +39,7 @@ class KMLightNoNetworkView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .center
-        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor(hex: "#94989C")])
+        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor.km_init(hex: "#94989C")])
         
     }
     

+ 17 - 17
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginInputPasswordView.swift

@@ -50,7 +50,7 @@ class KMLoginInputPasswordView: KMBaseXibView {
     override func setup() {
         super.setup()
         
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         
         self.emailTextView.delegate = self
@@ -58,23 +58,23 @@ class KMLoginInputPasswordView: KMBaseXibView {
         self.emailTextView.frame = (self.emailTextView.enclosingScrollView?.contentView.bounds)!
         self.emailTextView.autoresizingMask = [.width, .height]
         
-        self.describeLable.textColor = NSColor(hex: "#252629")
+        self.describeLable.textColor = NSColor.km_init(hex: "#252629")
         self.describeLable.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.passwordAlertLabel.textColor = NSColor(hex: "#F3465B")
+        self.passwordAlertLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.forgotPasswordButton.font = NSFont.SFProTextRegularFont(12.0)
-        self.forgotPasswordButton.contentTintColor = NSColor(hex: "#1770F4")
+        self.forgotPasswordButton.contentTintColor = NSColor.km_init(hex: "#1770F4")
         
         self.passwordTextField.delegate = self
         self.passwordTextField.onFocus = {
-            self.passwordContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.passwordSecureTextField.delegate = self
         self.passwordSecureTextField.onFocus = {
-            self.passwordContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.loginButtonVC = KMDesignButton(withType: .Text)
@@ -119,16 +119,16 @@ class KMLoginInputPasswordView: KMBaseXibView {
         super.updateUI()
        
         //password
-        self.passwordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
-        self.passwordTextField.textColor = NSColor(hex: "#252629")
+        self.passwordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
+        self.passwordTextField.textColor = NSColor.km_init(hex: "#252629")
         self.passwordTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.passwordTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.passwordTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.passwordSecureTextField.textColor = NSColor(hex: "#252629")
+        self.passwordSecureTextField.textColor = NSColor.km_init(hex: "#252629")
         self.passwordSecureTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.passwordSecureTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.passwordSecureTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.passwordAlertLabel.textColor = NSColor(hex: "#F3465B")
+        self.passwordAlertLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
@@ -141,10 +141,10 @@ class KMLoginInputPasswordView: KMBaseXibView {
         self.describeLable.stringValue = NSLocalizedString("Enter password", comment: "")
         
         self.loginButtonVC.stringValue = NSLocalizedString("Log In", comment: "")
-        self.passwordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        self.passwordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
         
 
-        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
     
         self.passwordAlertLabel.stringValue = NSLocalizedString(KMRequestServerErrorCodeType.typeOfMessage(type: self.model.passwordAlertType), comment: "")
         
@@ -157,13 +157,13 @@ class KMLoginInputPasswordView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .left;
         attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#252629"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#252629"),
                                         NSAttributedString.Key.paragraphStyle : paragraphStyle],
                                     range: NSRange(location: 0, length: string.count))
 
         let range = string.range(of: NSLocalizedString("Change Email", comment: ""))
         attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "changeEmail://"],
                                        range: string.nsRange(from: range!)!)
@@ -213,7 +213,7 @@ extension KMLoginInputPasswordView: NSTextFieldDelegate {
         let textField = obj.object as? NSTextField
         if (textField == self.passwordTextField ||
             textField == self.passwordSecureTextField) {
-            self.passwordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
         }
     }
     

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginLeftImageView.swift

@@ -30,7 +30,7 @@ class KMLoginLeftImageView: KMBaseXibView {
     override func setup() {
         super.setup()
         
-//        self.subscriptionButton.setTitleColor(NSColor(hex: "#3F8FF6"))
+//        self.subscriptionButton.setTitleColor(NSColor.km_init(hex: "#3F8FF6"))
 //        self.subscriptionButton.font = NSFont.SFProTextSemiboldFont(12.0)
         
         self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in

+ 12 - 12
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginView.swift

@@ -40,7 +40,7 @@ class KMLoginView: KMBaseXibView {
         super.setup()
         self.emailTextField.delegate = self
         self.emailTextField.onFocus = {
-            self.textFieldContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.textFieldContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.registerTextView.delegate = self
@@ -60,19 +60,19 @@ class KMLoginView: KMBaseXibView {
     
     override func updateUI() {
         super.updateUI()
-        self.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.font = NSFont.SFProTextRegularFont(20.0)
         
-        self.loginDescripeLabel.textColor = NSColor(hex: "#252629")
+        self.loginDescripeLabel.textColor = NSColor.km_init(hex: "#252629")
         self.loginDescripeLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.emailTextField.textColor = NSColor(hex: "#252629")
+        self.emailTextField.textColor = NSColor.km_init(hex: "#252629")
         self.emailTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.emailTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.emailTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.alertLabel.textColor = NSColor(hex: "#F3465B")
+        self.alertLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.alertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
@@ -82,9 +82,9 @@ class KMLoginView: KMBaseXibView {
         
         self.loginDescripeLabel.stringValue = NSLocalizedString("Enter email account", comment: "")
         
-        self.textFieldContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+        self.textFieldContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         
-        self.emailTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter email address", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        self.emailTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter email address", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
         
         
         let string = NSLocalizedString("Don’t have an account yet?", comment: "") + "  " + NSLocalizedString("Sign up", comment: "")
@@ -92,13 +92,13 @@ class KMLoginView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .center;
         attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#252629"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#252629"),
                                         NSAttributedString.Key.paragraphStyle : paragraphStyle],
                                     range: NSRange(location: 0, length: string.count))
         
         let range = string.range(of: NSLocalizedString("Sign up", comment: ""))
         attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "register://"],
                                        range: string.nsRange(from: range!)!)
@@ -140,7 +140,7 @@ extension KMLoginView: NSTextFieldDelegate {
         let textField = obj.object as? NSTextField
         if (textField == self.emailTextField) {
             self.emainDidEndEditing()
-            self.textFieldContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
+            self.textFieldContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
         }
     }
     

+ 15 - 15
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMRegisterSuccessView.swift

@@ -37,7 +37,7 @@ class KMRegisterSuccessView: KMBaseXibView {
         super.setup()
         
         
-//        self.imageView.backgroundColor(NSColor(hex: "#D9D9D9"))
+//        self.imageView.backgroundColor(NSColor.km_init(hex: "#D9D9D9"))
         
 //        self.doneButtonVC = KMDesignButton(withType: .Text)
 //        self.doneButton.addSubview(self.doneButtonVC.view)
@@ -50,8 +50,8 @@ class KMRegisterSuccessView: KMBaseXibView {
 //        self.doneButtonVC.updateUI()
         
         self.doneButton.border(.white,0, 20)
-        self.doneButton.backgroundColor(NSColor(hex: "#FF852E"))
-        self.doneButton.contentTintColor = NSColor(hex: "#FFFFFF")
+        self.doneButton.backgroundColor(NSColor.km_init(hex: "#FF852E"))
+        self.doneButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.doneButton.font = NSFont.SFProTextSemiboldFont(16)
         
         self.textView.delegate = self
@@ -63,9 +63,9 @@ class KMRegisterSuccessView: KMBaseXibView {
         self.label2.font = NSFont.SFProTextRegularFont(11)
         self.label3.font = NSFont.SFProTextRegularFont(11)
         
-        self.label1.textColor = NSColor(hex: "#252629")
-        self.label2.textColor = NSColor(hex: "#252629")
-        self.label3.textColor = NSColor(hex: "#252629")
+        self.label1.textColor = NSColor.km_init(hex: "#252629")
+        self.label2.textColor = NSColor.km_init(hex: "#252629")
+        self.label3.textColor = NSColor.km_init(hex: "#252629")
     }
     
     override func reloadData() {
@@ -73,13 +73,13 @@ class KMRegisterSuccessView: KMBaseXibView {
         if KMLightMemberManager.manager.purchaseState == .subscription {
             self.doneButton.isEnabled = false
             self.doneButton.title = NSLocalizedString("Already Subscribed", comment: "")
-            self.doneButton.backgroundColor(NSColor(hex: "#FFD09E"))
-            self.doneButton.contentTintColor = NSColor(hex: "#F7F8FA")
+            self.doneButton.backgroundColor(NSColor.km_init(hex: "#FFD09E"))
+            self.doneButton.contentTintColor = NSColor.km_init(hex: "#F7F8FA")
         } else {
             self.doneButton.isEnabled = true
             self.doneButton.title = NSLocalizedString("Subscribe", comment: "")
-            self.doneButton.backgroundColor(NSColor(hex: "#FF852E"))
-            self.doneButton.contentTintColor = NSColor(hex: "#FFFFFF")
+            self.doneButton.backgroundColor(NSColor.km_init(hex: "#FF852E"))
+            self.doneButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         }
     }
     
@@ -95,32 +95,32 @@ class KMRegisterSuccessView: KMBaseXibView {
         let ParagraphStyle1 = NSMutableParagraphStyle()
         ParagraphStyle1.lineHeightMultiple = 1.2
         ParagraphStyle1.alignment = .left
-        self.titleLabel.attributedStringValue = NSMutableAttributedString(string: string1, attributes: [NSAttributedString.Key.paragraphStyle: ParagraphStyle1, .foregroundColor : NSColor(hex: "#616469"), NSAttributedString.Key.font: NSFont.SFProTextSemiboldFont(20.0)])
+        self.titleLabel.attributedStringValue = NSMutableAttributedString(string: string1, attributes: [NSAttributedString.Key.paragraphStyle: ParagraphStyle1, .foregroundColor : NSColor.km_init(hex: "#616469"), NSAttributedString.Key.font: NSFont.SFProTextSemiboldFont(20.0)])
         
         let string2 = NSLocalizedString("Enjoy advanced features now!", comment: "")
         let titleParagraphStyle2 = NSMutableParagraphStyle()
         titleParagraphStyle2.lineHeightMultiple = 1.26
         titleParagraphStyle2.alignment = .left
-        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: string2, attributes: [NSAttributedString.Key.paragraphStyle: titleParagraphStyle2, .foregroundColor : NSColor(hex: "#252629"), NSAttributedString.Key.font: NSFont.SFProTextRegularFont(16.0)])
+        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: string2, attributes: [NSAttributedString.Key.paragraphStyle: titleParagraphStyle2, .foregroundColor : NSColor.km_init(hex: "#252629"), NSAttributedString.Key.font: NSFont.SFProTextRegularFont(16.0)])
         
         let string3 = NSLocalizedString("Or subscribe to us to unlock more powerful features", comment: "")
         let titleParagraphStyle3 = NSMutableParagraphStyle()
         titleParagraphStyle3.lineHeightMultiple = 1.32
         titleParagraphStyle3.alignment = .left
-        self.subscribeTitleLabel.attributedStringValue = NSMutableAttributedString(string: string3, attributes: [NSAttributedString.Key.paragraphStyle: titleParagraphStyle3, .foregroundColor : NSColor(hex: "#1AD598"), NSAttributedString.Key.font: NSFont.SFProTextSemiboldFont(14.0)])
+        self.subscribeTitleLabel.attributedStringValue = NSMutableAttributedString(string: string3, attributes: [NSAttributedString.Key.paragraphStyle: titleParagraphStyle3, .foregroundColor : NSColor.km_init(hex: "#1AD598"), NSAttributedString.Key.font: NSFont.SFProTextSemiboldFont(14.0)])
         
         let string = NSLocalizedString("Want to save documents with unlimited conversion and no watermark?", comment: "") + "  " + NSLocalizedString("Subscription", comment: "")
         let attributedString = NSMutableAttributedString.init(string: string)
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .center;
         attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#252629"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#252629"),
                                         NSAttributedString.Key.paragraphStyle : paragraphStyle],
                                     range: NSRange(location: 0, length: string.count))
         
         let range = string.range(of: NSLocalizedString("Subscription", comment: ""))
         attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "register://"],
                                        range: string.nsRange(from: range!)!)

+ 25 - 25
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMRegisterView.swift

@@ -61,17 +61,17 @@ class KMRegisterView: KMBaseXibView {
         
         self.emailTextField.delegate = self
         self.emailTextField.onFocus = {
-            self.emailContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.emailContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.passwordTextField.delegate = self
         self.passwordTextField.onFocus = {
-            self.passwordContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.passwordSecureTextField.delegate = self
         self.passwordSecureTextField.onFocus = {
-            self.passwordContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.nextButtonVC = KMDesignButton(withType: .Text)
@@ -90,38 +90,38 @@ class KMRegisterView: KMBaseXibView {
     override func updateLanguage() {
         super.updateLanguage()
         
-        self.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.font = NSFont.SFProTextRegularFont(20.0)
         self.titleLabel.stringValue = NSLocalizedString("Sign Up", comment: "")
         
         self.nextButtonVC.stringValue = NSLocalizedString("Next Step", comment: "")
 
         //email
-        self.emailContentView.border(NSColor(hex: "#1770F4"), 1, 4)
-        self.emailTextField.textColor = NSColor(hex: "#252629")
+        self.emailContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
+        self.emailTextField.textColor = NSColor.km_init(hex: "#252629")
         self.emailTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.emailTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter email address", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
-        self.emailTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.emailTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter email address", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
+        self.emailTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.emailAlertTextLabel.textColor = NSColor(hex: "#F3465B")
+        self.emailAlertTextLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.emailAlertTextLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.emailAlertTextLabel.stringValue = NSLocalizedString("This account is registered", comment: "")
         
         //password
-        self.passwordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
-        self.passwordTextField.textColor = NSColor(hex: "#252629")
+        self.passwordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
+        self.passwordTextField.textColor = NSColor.km_init(hex: "#252629")
         self.passwordTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.passwordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
-        self.passwordTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.passwordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
+        self.passwordTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.passwordSecureTextField.textColor = NSColor(hex: "#252629")
+        self.passwordSecureTextField.textColor = NSColor.km_init(hex: "#252629")
         self.passwordSecureTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
-        self.passwordSecureTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
+        self.passwordSecureTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
     
-        self.passwordAlertLabel.textColor = NSColor(hex: "#F3465B")
+        self.passwordAlertLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.passwordAlertLabel.stringValue = NSLocalizedString("At least 6 characters", comment: "")
         
@@ -131,13 +131,13 @@ class KMRegisterView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .center;
         attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#252629"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#252629"),
                                         NSAttributedString.Key.paragraphStyle : paragraphStyle],
                                     range: NSRange(location: 0, length: string.count))
 
         let range = string.range(of: NSLocalizedString("Log in", comment: ""))
         attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "login://"],
                                        range: string.nsRange(from: range!)!)
@@ -152,14 +152,14 @@ class KMRegisterView: KMBaseXibView {
         pParagraphStyle.lineBreakMode = .byWordWrapping
         pParagraphStyle.alignment = .left;
         pAttributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(11.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#616469"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#616469"),
                                         NSAttributedString.Key.paragraphStyle : pParagraphStyle],
                                     range: NSRange(location: 0, length: pString.count))
     
         let pRange = pString.range(of: NSLocalizedString("Privacy Policy", comment: ""))
         if pRange != nil {
             pAttributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(11.0),
-                                            NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
+                                            NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#1770F4"),
                                             NSAttributedString.Key.underlineColor : NSColor.clear,
                                             NSAttributedString.Key.link : "privacy://"],
                                            range: pString.nsRange(from: pRange!)!)
@@ -168,7 +168,7 @@ class KMRegisterView: KMBaseXibView {
         let lRange = pString.range(of: NSLocalizedString("Term Service", comment: ""))
         if lRange != nil {
             pAttributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(11.0),
-                                            NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
+                                            NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#1770F4"),
                                             NSAttributedString.Key.underlineColor : NSColor.clear,
                                             NSAttributedString.Key.link : "license://"],
                                            range: pString.nsRange(from: lRange!)!)
@@ -226,12 +226,12 @@ extension KMRegisterView: NSTextFieldDelegate {
         }
         
         if (textField == self.emailTextField) {
-            self.emailContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
+            self.emailContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
         }
         
         if (textField == self.passwordTextField ||
             textField == self.passwordSecureTextField) {
-            self.passwordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
         }
     }
     

+ 23 - 23
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMResetPasswordView.swift

@@ -49,28 +49,28 @@ class KMResetPasswordView: KMBaseXibView {
         self.model.logType = .resetPassword
         
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(20.0)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         
         self.passwordTextField.delegate = self
         self.passwordSecureTextField.delegate = self
         self.passwordTextField.onFocus = {
-            self.passwordContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.passwordSecureTextField.onFocus = {
-            self.passwordContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         
         self.rePasswordTextField.delegate = self
         self.rePasswordSecureTextField.delegate = self
         self.rePasswordTextField.onFocus = {
-            self.rePasswordContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.rePasswordContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.rePasswordSecureTextField.onFocus = {
-            self.rePasswordContentView.border(NSColor(hex: "#1770F4"), 1, 4)
+            self.rePasswordContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
         }
         
         self.doneButtonVC = KMDesignButton(withType: .Text)
@@ -87,29 +87,29 @@ class KMResetPasswordView: KMBaseXibView {
     override func updateUI() {
         super.updateUI()
         //password
-        self.passwordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
-        self.passwordTextField.textColor = NSColor(hex: "#252629")
+        self.passwordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
+        self.passwordTextField.textColor = NSColor.km_init(hex: "#252629")
         self.passwordTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.passwordTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.passwordTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.passwordSecureTextField.textColor = NSColor(hex: "#252629")
+        self.passwordSecureTextField.textColor = NSColor.km_init(hex: "#252629")
         self.passwordSecureTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.passwordSecureTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.passwordSecureTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.passwordAlertLabel.textColor = NSColor(hex: "#F3465B")
+        self.passwordAlertLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         //repassword
-        self.rePasswordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
-        self.rePasswordTextField.textColor = NSColor(hex: "#252629")
+        self.rePasswordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
+        self.rePasswordTextField.textColor = NSColor.km_init(hex: "#252629")
         self.rePasswordTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.rePasswordTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.rePasswordTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.rePasswordSecureTextField.textColor = NSColor(hex: "#252629")
+        self.rePasswordSecureTextField.textColor = NSColor.km_init(hex: "#252629")
         self.rePasswordSecureTextField.font = NSFont.SFProTextRegularFont(14.0)
-        self.rePasswordSecureTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
+        self.rePasswordSecureTextField.border(NSColor.km_init(hex: "#FFFFFF"), 1, 0)
         
-        self.rePasswordAlertLabel.textColor = NSColor(hex: "#F3465B")
+        self.rePasswordAlertLabel.textColor = NSColor.km_init(hex: "#F3465B")
         self.rePasswordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
@@ -179,15 +179,15 @@ class KMResetPasswordView: KMBaseXibView {
         self.doneButtonVC.stringValue = NSLocalizedString("OK", comment: "")
         
         //password
-        self.passwordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter new password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        self.passwordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter new password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
         
-        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter new password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter new password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
     
         
         //rePassword
-        self.rePasswordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter the new password again", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        self.rePasswordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter the new password again", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
         
-        self.rePasswordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter the new password again", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        self.rePasswordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter the new password again", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C") ])
     
     }
 }
@@ -242,12 +242,12 @@ extension KMResetPasswordView: NSTextFieldDelegate {
         let textField = obj.object as? NSTextField
         if (textField == self.passwordTextField ||
             textField == self.passwordSecureTextField) {
-            self.passwordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
+            self.passwordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
         }
         
         if (textField == self.rePasswordTextField ||
             textField == self.rePasswordSecureTextField) {
-            self.rePasswordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
+            self.rePasswordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
         }
         
         if (textField == self.passwordSecureTextField ||

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/SubscribeSuccess/KMSubscribeSuccessWindowController.swift

@@ -46,7 +46,7 @@ class KMSubscribeSuccessWindowController: NSWindowController {
     }
     
     func setup() {
-        self.window?.contentView?.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.window?.contentView?.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         self.successView.doneAction = { [weak self] view in
             
             guard let callBack = self?.closeAction else { return }

+ 4 - 4
PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/SubscribeSuccess/View/KMSubscribeSuccessView.swift

@@ -26,14 +26,14 @@ class KMSubscribeSuccessView: KMBaseXibView {
     
     override func setup() {
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(20)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.subtitleLabel.font = NSFont.SFProTextSemiboldFont(14)
-        self.subtitleLabel.textColor = NSColor(hex: "#616469")
+        self.subtitleLabel.textColor = NSColor.km_init(hex: "#616469")
         
-        self.doneButton.contentTintColor = NSColor(hex: "#FFFFFF")
+        self.doneButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.doneButton.font = NSFont.SFProTextRegularFont(14)
-        self.doneButton.backgroundColor(NSColor(hex: "#1770F4"))
+        self.doneButton.backgroundColor(NSColor.km_init(hex: "#1770F4"))
         self.doneButton.border(NSColor.clear, 0, 4)
     }
     

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift

@@ -186,7 +186,7 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
     }
     
     func setup() {
-        self.window?.contentView?.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.window?.contentView?.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         self.waterMarkView.waterExportButton.title = ""
         self.waterMarkView.subscribeLabel.stringValue = ""
         self.waterMarkView.closeAction = { [weak self] view in

+ 2 - 2
PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkCollectionItem.swift

@@ -27,10 +27,10 @@ class KMSubscribeWaterMarkCollectionItem: NSCollectionViewItem {
     }
     
     func setup() {
-        self.titleLabel.textColor = NSColor(hex: "#273C62")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#273C62")
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(14)
         
-        self.subtitleLabel.textColor = NSColor(hex: "#616469")
+        self.subtitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.subtitleLabel.font = NSFont.SFProTextRegularFont(12)
     }
     

+ 17 - 18
PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -84,10 +84,9 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
             } else {
                 self.cancelBox.isHidden = !isSecondEnable
 //                self.waterExportButton.isEnabled = isSecondEnable
-                self.waterExportButton.contentTintColor = NSColor(hex: "#F3465B")
+                self.waterExportButton.contentTintColor = NSColor.km_init(hex: "#F3465B")
                 self.waterExportButton.backgroundColor(NSColor.clear)
-                self.waterExportButton.border(NSColor(hex: "#DFE1E5"), 0, 20)
-//                self.waterExportButton.contentTintColor = NSColor(hex: "#252629")
+                self.waterExportButton.border(NSColor.km_init(hex: "#DFE1E5"), 0, 20)
                 self.waterExportButton.font = NSFont.SFProTextRegularFont(12)
             }
         }
@@ -112,45 +111,45 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
         //注册cell
         self.collectionView.register(KMSubscribeWaterMarkCollectionItem.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMSubscribeWaterMarkCollectionItem"))
         
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(20)
         
-        self.waterExportButton.backgroundColor(NSColor(hex: "#EDEEF0"))
-        self.waterExportButton.border(NSColor(hex: "#DFE1E5"), 1, 20)
-        self.waterExportButton.contentTintColor = NSColor(hex: "#252629")
+        self.waterExportButton.backgroundColor(NSColor.km_init(hex: "#EDEEF0"))
+        self.waterExportButton.border(NSColor.km_init(hex: "#DFE1E5"), 1, 20)
+        self.waterExportButton.contentTintColor = NSColor.km_init(hex: "#252629")
         self.waterExportButton.font = NSFont.SFProTextRegularFont(16)
         
-        self.subscribeView.backgroundColor(NSColor(hex: "#FF852E"))
-        self.subscribeView.border(NSColor(hex: "#DFE1E5"), 0, 20)
-        self.subscribeLabel.textColor = NSColor(hex: "#FFFFFF")
+        self.subscribeView.backgroundColor(NSColor.km_init(hex: "#FF852E"))
+        self.subscribeView.border(NSColor.km_init(hex: "#DFE1E5"), 0, 20)
+        self.subscribeLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
         self.subscribeLabel.font = NSFont.SFProTextRegularFont(16)
         
         self.subscribeBox.moveCallback = { [unowned self] mouseEntered, mouseBox in
             if mouseEntered {
-                self.subscribeView.backgroundColor(NSColor(hex: "#FFA153"))
+                self.subscribeView.backgroundColor(NSColor.km_init(hex: "#FFA153"))
             } else {
-                self.subscribeView.backgroundColor(NSColor(hex: "#FF852E"))
+                self.subscribeView.backgroundColor(NSColor.km_init(hex: "#FF852E"))
             }
         }
         
         self.subscribeBox.downCallback = { [unowned self] mouseEntered, mouseBox, event in
             if mouseEntered {
-                self.subscribeView.backgroundColor(NSColor(hex: "#D2621C"))
+                self.subscribeView.backgroundColor(NSColor.km_init(hex: "#D2621C"))
             } else {
-                self.subscribeView.backgroundColor(NSColor(hex: "#FF852E"))
+                self.subscribeView.backgroundColor(NSColor.km_init(hex: "#FF852E"))
                 self.subscribeButtonAction(self.subscribeView as Any)
             }
         }
         
         self.cancelBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in
             if mouseEntered {
-                self?.waterExportButton?.backgroundColor(NSColor(hex: "#DFE1E5"))
+                self?.waterExportButton?.backgroundColor(NSColor.km_init(hex: "#DFE1E5"))
             } else {
-                self?.waterExportButton?.backgroundColor(NSColor(hex: "#EDEEF0"))
+                self?.waterExportButton?.backgroundColor(NSColor.km_init(hex: "#EDEEF0"))
             }
         }
         
-        self.lineView.backgroundColor(NSColor(hex: "#000000").withAlphaComponent(0.1))
+        self.lineView.backgroundColor(NSColor.km_init(hex: "#000000").withAlphaComponent(0.1))
         
         // 获取包含 NSCollectionView 的 NSScrollView
         if let scrollView = collectionView.enclosingScrollView {
@@ -186,7 +185,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .left
-        self.subtitleLabel.textColor = NSColor(hex: "#273C62")
+        self.subtitleLabel.textColor = NSColor.km_init(hex: "#273C62")
         self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: NSLocalizedString(subtitleString, comment: ""), attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12)])
     }
 

+ 1 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/VerificationCode/KMVerficationCodeWindowController.swift

@@ -45,7 +45,7 @@ class KMVerficationCodeWindowController: NSWindowController {
     }
     
     func setup() {
-        self.window?.contentView?.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.window?.contentView?.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
         self.verificationCodeView.closeAction = { view in
             KMPrint("关闭")

+ 2 - 2
PDF Office/PDF Master/Class/KMLightMember/Controller/VerificationCode/View/KMLightMemberAlertView.swift

@@ -34,10 +34,10 @@ class KMLightMemberAlertView: KMBaseXibView {
     
     override func updateUI() {
         super.updateUI()
-        self.contentView.backgroundColor(NSColor(hex: "#FDC7C6"))
+        self.contentView.backgroundColor(NSColor.km_init(hex: "#FDC7C6"))
         
         self.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
     }
     
     override func reloadData() {

+ 14 - 14
PDF Office/PDF Master/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift

@@ -110,13 +110,13 @@ class KMVerificationCodeView: KMBaseXibView {
     override func setup() {
         super.setup()
         
-        self.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(20.0)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.describeLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.describeLabel.textColor = NSColor(hex: "#252629")
+        self.describeLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.timerTextView.delegate = self
         self.timerTextView.frame = (self.timerTextView.enclosingScrollView?.contentView.bounds)!
@@ -127,20 +127,20 @@ class KMVerificationCodeView: KMBaseXibView {
         for i in 0...textFieldArray.count - 1 {
             let textField = textFieldArray[i]
             if textField != nil {
-                textField!.textField.textColor = NSColor(hex: "#252629")
+                textField!.textField.textColor = NSColor.km_init(hex: "#252629")
                 textField!.textField.font = NSFont.SFProTextSemiboldFont(20.0)
                 textField?.maxLen = 1
                 textField?.model.isCanNull = true
                 textField?.textField.tag = i + 10
                 textField!.textField.alignment = .center
-                textField?.superview?.border(NSColor(hex: "#DFE1E5"), 1, 2)
+                textField?.superview?.border(NSColor.km_init(hex: "#DFE1E5"), 1, 2)
                 textField?.textField.onFocus = { [unowned self] in
                     self.cancelAllTextFieldFouce()
-                    textField?.superview?.border(NSColor(hex: "#1770F4"), 1, 2)
+                    textField?.superview?.border(NSColor.km_init(hex: "#1770F4"), 1, 2)
                 }
                 
                 textField?.textDidEndEditing = { [unowned self] string in
-                    textField?.superview?.border(NSColor(hex: "#DFE1E5"), 1, 2)
+                    textField?.superview?.border(NSColor.km_init(hex: "#DFE1E5"), 1, 2)
                 }
                 
                 textField?.textDidChange = { [unowned self] string in
@@ -160,7 +160,7 @@ class KMVerificationCodeView: KMBaseXibView {
                         tag = max(10, tag)
                         if item?.textField.tag == tag {
                             item?.textField.becomeFirstResponder()
-                            item?.superview?.border(NSColor(hex: "#1770F4"), 1, 2)
+                            item?.superview?.border(NSColor.km_init(hex: "#1770F4"), 1, 2)
                             break
                         }
                     }
@@ -174,7 +174,7 @@ class KMVerificationCodeView: KMBaseXibView {
 
                             if item?.textField.tag == tag {
                                 item?.textField.becomeFirstResponder()
-                                item?.superview?.border(NSColor(hex: "#1770F4"), 1, 2)
+                                item?.superview?.border(NSColor.km_init(hex: "#1770F4"), 1, 2)
                                 break
                             }
                         }
@@ -283,13 +283,13 @@ class KMVerificationCodeView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .left;
         attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#252629"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#252629"),
                                         NSAttributedString.Key.paragraphStyle : paragraphStyle],
                                     range: NSRange(location: 0, length: string.count))
 
         let range = string.range(of: NSLocalizedString(timeString, comment: ""))
         attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
-                                        NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
+                                        NSAttributedString.Key.foregroundColor : NSColor.km_init(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "timer://"],
                                        range: string.nsRange(from: range!)!)
@@ -305,7 +305,7 @@ class KMVerificationCodeView: KMBaseXibView {
             item?.textField.resignFirstResponder()
             
             if item != self.code1TextField {
-                item?.superview?.border(NSColor(hex: "#DFE1E5"), 1, 2)
+                item?.superview?.border(NSColor.km_init(hex: "#DFE1E5"), 1, 2)
             }
         }
         self.model.verifyCode = ""
@@ -424,7 +424,7 @@ extension KMVerificationCodeView: KMVerificationCodeViewAction {
     func cancelAllTextFieldFouce() {
         let textFieldArray = [self.code1TextField,self.code2TextField,self.code3TextField,self.code4TextField,self.code5TextField,self.code6TextField]
         for item in textFieldArray {
-            item?.superview?.border(NSColor(hex: "#DFE1E5"), 1, 2)
+            item?.superview?.border(NSColor.km_init(hex: "#DFE1E5"), 1, 2)
         }
     }
     
@@ -454,7 +454,7 @@ extension KMVerificationCodeView: NSTextFieldDelegate {
         for view in self.textFieldContentView.subviews {
             let t = view.subviews.first as? FocusAwareTextField
             if t == textField {
-                view.border(NSColor(hex: "#DFE1E5"), 1, 4)
+                view.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
             }
         }
     }

+ 2 - 2
PDF Office/PDF Master/Class/KMLightMember/Tools/Alert/KMPurchaseAlertView.swift

@@ -47,9 +47,9 @@ class KMPurchaseAlertView: KMBaseXibView {
     }
     
     override func setup() {
-        self.contentBackgroundView.backgroundColor(NSColor(hex: "#000000").withAlphaComponent(1))
+        self.contentBackgroundView.backgroundColor(NSColor.km_init(hex: "#000000").withAlphaComponent(1))
         self.contentBackgroundView.border(NSColor.clear, 0, 4)
-        self.titleLabel.textColor = NSColor(hex: "#FFFFFF")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
         self.titleLabel.font = NSFont.SFProTextRegularFont(14)
     }
     

+ 1 - 2
PDF Office/PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m

@@ -505,8 +505,7 @@ static KMPDFEditAppendWindow *windowController = nil;
     
     self.limitLable.stringValue = NSLocalizedString(@"Merge 2 files at a time", "");
     self.limitLable.font = [NSFont SFProTextRegularFont:12];
-    self.limitLable.textColor = [[NSColor alloc] initWithHex:@"#F3465B" alpha:1];
-    
+    self.limitLable.textColor = [NSColor km_initWithHex:@"#F3465B" alpha:1];
     self.limit = NO;
     
     BOOL result = [KMLightMemberManager.manager canPayFunction];

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Batch/KMBatchWindowController.swift

@@ -68,7 +68,7 @@ class KMBatchWindowController: NSWindowController {
         self.window?.contentView?.layer?.backgroundColor = NSColor.white.cgColor
         
         self.titleLabel.font = NSFont.SFProTextRegularFont(16.0)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.batchCollectionView.delegate = self
         self.batchPrecessingView.delegate = self

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Batch/View/BatchCollectionView/KMBatchCollectionView.swift

@@ -43,7 +43,7 @@ class KMBatchCollectionView: KMBaseXibView {
         super.setup()
         
         self.contentView.wantsLayer = true
-        self.contentView.layer?.backgroundColor = NSColor.init(hex: "#F7F8FA").cgColor
+        self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
         
         self.collectionView.delegate = self
         self.collectionView.dataSource = self

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/Batch/View/BatchCollectionView/View/KMBatchCollectionViewItem.swift

@@ -30,12 +30,12 @@ class KMBatchCollectionViewItem: NSCollectionViewItem {
         self.titleTextField.stringValue = NSLocalizedString(self.model.title, comment: "")
         
         if self.model.isSelect {
-            self.titleTextField.textColor = NSColor(hex: "#1770F4")
+            self.titleTextField.textColor = NSColor.km_init(hex: "#1770F4")
             
             self.iconImageView.image = NSImage(named: self.model.selectImageString)
-            self.contentView.layer?.backgroundColor = NSColor.init(hex: "#1770F4", alpha: 0.1).cgColor
+            self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1).cgColor
         } else {
-            self.titleTextField.textColor = NSColor(hex: "#616469")
+            self.titleTextField.textColor = NSColor.km_init(hex: "#616469")
             
             self.iconImageView.image = NSImage(named: self.model.imageString)
             self.contentView.layer?.backgroundColor = NSColor.clear.cgColor

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Background/KMBatchBackgroundView.swift

@@ -33,20 +33,20 @@ class KMBatchBackgroundView: KMBatchSettingItemView {
         
         self.applyButton.wantsLayer = true
         self.applyButton.layer?.cornerRadius = 4
-        self.applyButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.applyButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.applyButton.stringValue = NSLocalizedString("Compress", comment: "")
         self.applyButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.applyButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
     }
     
     override func reloadData() {
         super.reloadData()
         
         if (self.filesData.count != 0 && self.data != nil) {
-            self.applyButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.applyButton.isEnabled = true
         } else {
-            self.applyButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.applyButton.isEnabled = false
         }
     }

+ 10 - 10
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/BatchRemove/KMBatchRemoveView.swift

@@ -80,30 +80,30 @@ class KMBatchRemoveView: KMBatchSettingItemView {
             self.reloadData()
         }
         
-        self.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
         self.titleLabel.font = NSFont.SFProTextRegularFont(16.0)
         
         self.removeButton.wantsLayer = true
         self.removeButton.layer?.cornerRadius = 4
-        self.removeButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.removeButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.removeButton.stringValue = NSLocalizedString("Compress", comment: "")
         self.removeButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.removeButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.removeButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
         
-        self.securityButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.securityButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.securityButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.watermarkButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.watermarkButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.watermarkButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.backgroundButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.backgroundButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.backgroundButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.headerAndFoolterButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.headerAndFoolterButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.headerAndFoolterButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.batesNumberButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.batesNumberButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.batesNumberButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
     }
@@ -142,10 +142,10 @@ class KMBatchRemoveView: KMBatchSettingItemView {
         }
         
         if (self.filesData.count != 0 && self.data.options != .none) {
-            self.removeButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.removeButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.removeButton.isEnabled = true
         } else {
-            self.removeButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.removeButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.removeButton.isEnabled = false
         }
     }

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/BatesNumber/KMBatchBatesNumberView.swift

@@ -34,18 +34,18 @@ class KMBatchBatesNumberView: KMBatchSettingItemView {
         
         self.applyButton.wantsLayer = true
         self.applyButton.layer?.cornerRadius = 4
-        self.applyButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.applyButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.applyButton.stringValue = NSLocalizedString("Apply", comment: "")
         self.applyButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.applyButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
     }
     
     override func reloadData() {
         if (self.filesData.count != 0 && self.data != nil) {
-            self.applyButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.applyButton.isEnabled = true
         } else {
-            self.applyButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.applyButton.isEnabled = false
         }
     }

+ 10 - 10
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Compress/KMBatchCompressView.swift

@@ -55,31 +55,31 @@ class KMBatchCompressView: KMBatchSettingItemView {
             self.reloadData()
         }
         
-        self.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
         self.titleLabel.font = NSFont.SFProTextRegularFont(16.0)
         
-        self.subTitleLabel.textColor = NSColor.init(hex: "#616469")
+        self.subTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.subTitleLabel.stringValue = NSLocalizedString("Optimization Options", comment: "")
         self.subTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.compressButton.wantsLayer = true
         self.compressButton.layer?.cornerRadius = 4
-        self.compressButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.compressButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.compressButton.stringValue = NSLocalizedString("Compress", comment: "")
         self.compressButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.compressButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.compressButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
         
-        self.largeButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.largeButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.largeButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.standardButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.standardButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.standardButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.smallButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.smallButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.smallButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.minimumButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.minimumButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.minimumButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
 
     }
@@ -103,10 +103,10 @@ class KMBatchCompressView: KMBatchSettingItemView {
         }
         
         if (self.filesData.count != 0) {
-            self.compressButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.compressButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.compressButton.isEnabled = true
         } else {
-            self.compressButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.compressButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.compressButton.isEnabled = false
         }
     }

+ 7 - 7
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/KMBatchConvertPDFView.swift

@@ -40,22 +40,22 @@ class KMBatchConvertPDFView: KMBatchSettingItemView {
         
         self.presenter.initPresenter(view: self)
         
-        self.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
         self.titleLabel.font = NSFont.SFProTextRegularFont(16.0)
         
-        self.formatLabel.textColor = NSColor.init(hex: "#616469")
+        self.formatLabel.textColor = NSColor.km_init(hex: "#616469")
         self.formatLabel.stringValue = NSLocalizedString("Format", comment: "")
         self.formatLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.convertActionButton.wantsLayer = true
         self.convertActionButton.layer?.cornerRadius = 4
-        self.convertActionButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.convertActionButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.convertActionButton.stringValue = NSLocalizedString("Convert", comment: "")
         self.convertActionButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.convertActionButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.convertActionButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
         
-        self.convertTitleLabel.textColor = NSColor.init(hex: "#252629")
+        self.convertTitleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.convertTitleLabel.stringValue = NSLocalizedString("Word", comment: "")
         self.convertTitleLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
@@ -72,10 +72,10 @@ class KMBatchConvertPDFView: KMBatchSettingItemView {
         }
         
         if (self.filesData.count != 0) {
-            self.convertActionButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.convertActionButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.convertActionButton.isEnabled = true
         } else {
-            self.convertActionButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.convertActionButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.convertActionButton.isEnabled = false
         }
         

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/CSV/KMBatchConverPDFCSVView.swift

@@ -30,14 +30,14 @@ class KMBatchConverPDFCSVView: KMBatchConvertPDFItemView {
             self.presenter.csvOnlyTablesButtonAction(button: button)
         }
 
-        self.settingTitleLabel.textColor = NSColor.init(hex: "#616469")
+        self.settingTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.settingTitleLabel.stringValue = NSLocalizedString("Excel Worksheet Settings", comment: "")
         self.settingTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.onlyTablesButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.onlyTablesButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.onlyTablesButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.tablesTypeLabel.textColor = NSColor.init(hex: "#252629")
+        self.tablesTypeLabel.textColor = NSColor.km_init(hex: "#252629")
         self.tablesTypeLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     

+ 6 - 6
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/Excel/KMBatchConverPDFExcelView.swift

@@ -51,23 +51,23 @@ class KMBatchConverPDFExcelView: KMBatchConvertPDFItemView {
             self.presenter.onlyTextButtonAction(button: button)
         }
         
-        self.settingLabel.textColor = NSColor.init(hex: "#616469")
+        self.settingLabel.textColor = NSColor.km_init(hex: "#616469")
         self.settingLabel.stringValue = NSLocalizedString("Excel Worksheet Settings", comment: "")
         self.settingLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.formatButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.formatButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.formatButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.onlyTablesButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.onlyTablesButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.onlyTablesButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.onlyTextButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.onlyTextButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.onlyTextButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.worksheetButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.worksheetButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.worksheetButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.tablesTypeLabel.textColor = NSColor.init(hex: "#252629")
+        self.tablesTypeLabel.textColor = NSColor.km_init(hex: "#252629")
         self.tablesTypeLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     

+ 2 - 2
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/Image/KMBatchConverPDFImageView.swift

@@ -24,11 +24,11 @@ class KMBatchConverPDFImageView: KMBatchConvertPDFItemView {
         
         self.imageTypeLabel.stringValue = data.imageType.rawValue
         
-        self.settingLabel.textColor = NSColor.init(hex: "#616469")
+        self.settingLabel.textColor = NSColor.km_init(hex: "#616469")
         self.settingLabel.stringValue = NSLocalizedString("Format", comment: "")
         self.settingLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.imageTypeLabel.textColor = NSColor.init(hex: "#252629")
+        self.imageTypeLabel.textColor = NSColor.km_init(hex: "#252629")
         self.imageTypeLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/TextRecognition/KMBatchTextRecognitionView.swift

@@ -27,14 +27,14 @@ class KMBatchTextRecognitionView: KMBatchConvertPDFItemView {
             self.presenter.needRecognizeTextAction()
         }
         
-        self.textRecognitionSettingLabel.textColor = NSColor.init(hex: "#616469")
+        self.textRecognitionSettingLabel.textColor = NSColor.km_init(hex: "#616469")
         self.textRecognitionSettingLabel.stringValue = NSLocalizedString("Text Recognition Settings", comment: "")
         self.textRecognitionSettingLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.recognizeTextButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.recognizeTextButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.recognizeTextButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.languageLabel.textColor = NSColor.init(hex: "#252629")
+        self.languageLabel.textColor = NSColor.km_init(hex: "#252629")
         self.languageLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/Word/KMBatchConverPDFWordView.swift

@@ -34,14 +34,14 @@ class KMBatchConverPDFWordView: KMBatchConvertPDFItemView {
             self.presenter.retainPageLayoutAction(button: button)
         }
         
-        self.settingLabel.textColor = NSColor.init(hex: "#616469")
+        self.settingLabel.textColor = NSColor.km_init(hex: "#616469")
         self.settingLabel.stringValue = NSLocalizedString("Layout Settings", comment: "")
         self.settingLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.retainFlowingTextButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.retainFlowingTextButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.retainFlowingTextButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.retainPageLayoutButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.retainPageLayoutButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.retainPageLayoutButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Header&Footer/KMBatchHeaderAndFooterView.swift

@@ -33,18 +33,18 @@ class KMBatchHeaderAndFooterView: KMBatchSettingItemView {
         
         self.applyButton.wantsLayer = true
         self.applyButton.layer?.cornerRadius = 4
-        self.applyButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.applyButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.applyButton.stringValue = NSLocalizedString("Apply", comment: "")
         self.applyButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.applyButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
     }
     
     override func reloadData() {
         if (self.filesData.count != 0 && self.data != nil) {
-            self.applyButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.applyButton.isEnabled = true
         } else {
-            self.applyButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.applyButton.isEnabled = false
         }
     }

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/KMBatchSettingView.swift

@@ -39,7 +39,7 @@ class KMBatchSettingView: KMBaseXibView {
         super.setup()
         
         self.contentView.wantsLayer = true
-        self.contentView.layer?.backgroundColor = NSColor.init(hex: "#F7F8FA").cgColor
+        self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
         
         self.type = .convertPDF
     }

+ 16 - 16
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Security/KMBatchSecurityView.swift

@@ -50,17 +50,17 @@ class KMBatchSecurityView: KMBatchSettingItemView {
         
         //
         self.openPasswordTextFieldContentView.border()
-        self.openPasswordTextFieldContentView.backgroundColor(NSColor.init(hex: "#FFFFFF"))
+        self.openPasswordTextFieldContentView.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         //
-        self.openPasswordTextField.placeholderAttributedString = NSAttributedString.init(string: "Open Password", attributes: [NSAttributedString.Key.font: NSFont.SFProTextRegularFont(14), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C")])
-        self.openPasswordTextField.textColor = NSColor(hex: "#252629")
+        self.openPasswordTextField.placeholderAttributedString = NSAttributedString.init(string: "Open Password", attributes: [NSAttributedString.Key.font: NSFont.SFProTextRegularFont(14), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C")])
+        self.openPasswordTextField.textColor = NSColor.km_init(hex: "#252629")
         self.openPasswordTextField.font = NSFont.SFProTextRegularFont(14.0)
         //
         self.permissionTextFieldContentView.border()
-        self.permissionTextFieldContentView.backgroundColor(NSColor.init(hex: "#FFFFFF"))
+        self.permissionTextFieldContentView.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         //
-        self.permissionTextfield.placeholderAttributedString = NSAttributedString.init(string: "Permission Password", attributes: [NSAttributedString.Key.font: NSFont.SFProTextRegularFont(14), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C")])
-        self.permissionTextfield.textColor = NSColor(hex: "#252629")
+        self.permissionTextfield.placeholderAttributedString = NSAttributedString.init(string: "Permission Password", attributes: [NSAttributedString.Key.font: NSFont.SFProTextRegularFont(14), NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#94989C")])
+        self.permissionTextfield.textColor = NSColor.km_init(hex: "#252629")
         self.permissionTextfield.font = NSFont.SFProTextRegularFont(14.0)
         //
         self.documentPrintButton.title = NSLocalizedString("Restrict document printing", comment: "")
@@ -75,27 +75,27 @@ class KMBatchSecurityView: KMBatchSettingItemView {
             self.presenter.contentCopyButtonAction(sender: button)
         }
         
-        self.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
         self.titleLabel.font = NSFont.SFProTextRegularFont(16.0)
         
         self.encryptButton.wantsLayer = true
         self.encryptButton.layer?.cornerRadius = 4
-        self.encryptButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.encryptButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.encryptButton.stringValue = NSLocalizedString("Compress", comment: "")
         self.encryptButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.encryptButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.encryptButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
         
-        self.openPasswordButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.openPasswordButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.openPasswordButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.permissionButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.permissionButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.permissionButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.documentPrintButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.documentPrintButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.documentPrintButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.contentCopyButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.contentCopyButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         self.contentCopyButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
@@ -135,10 +135,10 @@ class KMBatchSecurityView: KMBatchSettingItemView {
         }
         
         if (self.filesData.count != 0) {
-            self.encryptButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.encryptButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.encryptButton.isEnabled = true
         } else {
-            self.encryptButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.encryptButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.encryptButton.isEnabled = false
         }
     }
@@ -176,7 +176,7 @@ class FocusAwareSecureTextField: NSSecureTextField {
     override func becomeFirstResponder() -> Bool {
         onFocus()
         let textView = window?.fieldEditor(true, for: nil) as? NSTextView
-        textView?.insertionPointColor = NSColor.init(hex: "#252629")
+        textView?.insertionPointColor = NSColor.km_init(hex: "#252629")
         return super.becomeFirstResponder()
     }
 

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Batch/View/Choose/Watermark/KMBatchWatermarkView.swift

@@ -34,20 +34,20 @@ class KMBatchWatermarkView: KMBatchSettingItemView {
         
         self.applyButton.wantsLayer = true
         self.applyButton.layer?.cornerRadius = 4
-        self.applyButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.applyButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.applyButton.stringValue = NSLocalizedString("Apply", comment: "")
         self.applyButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.applyButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
     }
     
     override func reloadData() {
         super.reloadData()
         
         if (self.filesData.count != 0 && self.data != nil) {
-            self.applyButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.applyButton.isEnabled = true
         } else {
-            self.applyButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.applyButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.applyButton.isEnabled = false
         }
     }

+ 5 - 5
PDF Office/PDF Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.swift

@@ -275,9 +275,9 @@ class KMConvertBaseWindowController: KMBaseWindowController {
         self.titleLabel.textColor = NSColor.titleColor()
         self.titleLabel.font = .SFProTextSemiboldFont(16)
         
-        self.leftBox.fillColor = NSColor(hex: "#F7F8FA")
-        self.prePDFView?.backgroundColor = NSColor(hex: "#F7F8FA")
-        self.numberBox.layer?.borderColor = NSColor(hex: "#DFE1E5").cgColor
+        self.leftBox.fillColor = NSColor.km_init(hex: "#F7F8FA")
+        self.prePDFView?.backgroundColor = NSColor.km_init(hex: "#F7F8FA")
+        self.numberBox.layer?.borderColor = NSColor.km_init(hex: "#DFE1E5").cgColor
         self.perLabel.textColor = NSColor.titleColor()
         self.perLabel.font = .SFProTextRegularFont(12)
         self.totalNumberLabel.textColor = NSColor.titleColor()
@@ -846,9 +846,9 @@ class KMConvertBaseWindowController: KMBaseWindowController {
         
         let progress = SKProgressController()
         progress.message = NSLocalizedString("Converting...", comment: "")
-        progress.window?.backgroundColor = NSColor(hex: "#36383B")
+        progress.window?.backgroundColor = NSColor.km_init(hex: "#36383B")
         progress.window?.contentView?.wantsLayer = true
-        progress.window?.contentView?.layer?.backgroundColor = NSColor(hex: "#36383B").cgColor
+        progress.window?.contentView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
         progress.progressField.textColor = NSColor.white
         
         progress.closeBlock = { [weak self] in

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertCSVSettingView.swift

@@ -34,7 +34,7 @@ class KMConvertCSVSettingView: KMConvertSettingView {
         
         self.oneFileForPageComboBox.title = NSLocalizedString("Excel Worksheet Settings", comment: "")
         self.oneFileForPageComboBox.font = .SFProTextSemiboldFont(12)
-        self.oneFileForPageComboBox.setTitleColor(NSColor(hex: "#616469"))
+        self.oneFileForPageComboBox.setTitleColor(NSColor.km_init(hex: "#616469"))
         
         self.onlyGetTableVC = KMDesignButton.init(withType: .CheckBox)
         self.onlyGetTableBox.contentView = self.onlyGetTableVC!.view

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertExcelSettingView.swift

@@ -86,7 +86,7 @@ class KMConvertExcelSettingView: KMConvertSettingView {
         super.initDefaultVlaue()
         
         self.excelSettingTitleLabel.stringValue = NSLocalizedString("Excel Worksheet Settings", comment: "")
-        self.excelSettingTitleLabel.textColor = NSColor(hex: "#616469")
+        self.excelSettingTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.excelSettingTitleLabel.font = .SFProTextSemiboldFont(12)
         
         self.allContentsBox.fillColor = .clear

+ 2 - 2
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertImageSettingView.swift

@@ -52,13 +52,13 @@ class KMConvertImageSettingView: KMConvertSettingView {
         self.formatBox.fillColor = .clear
         
         self.fileTypeTitleLabel.stringValue = NSLocalizedString("Format", comment: "")
-        self.fileTypeTitleLabel.textColor = NSColor(hex: "#616469")
+        self.fileTypeTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.fileTypeTitleLabel.font = .SFProTextSemiboldFont(12)
         
         self.formatBox.fillColor = .clear
         
         self.dpiTitleLabel.stringValue = NSLocalizedString("Resolution", comment: "")
-        self.dpiTitleLabel.textColor = NSColor(hex: "#616469")
+        self.dpiTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.dpiTitleLabel.font = .SFProTextBoldFont(12)
     }
     

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertOCRSettingItemView.swift

@@ -53,7 +53,7 @@ class KMConvertOCRSettingItemView: KMConvertBaseView {
         super.initDefaultVlaue()
         
         self.titleLabel.stringValue = NSLocalizedString("Text Recognition Settings", comment: "")
-        self.titleLabel.textColor = NSColor(hex: "#616469")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.titleLabel.font = .SFProTextRegularFont(12)
         
         self.checkBox.fillColor = .clear

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertPageRangeSettingItemView.swift

@@ -50,7 +50,7 @@ class KMConvertPageRangeSettingItemView: KMConvertBaseView {
         self.pageSizeBox.fillColor = .clear
         
         self.titleLabel.stringValue = NSLocalizedString("Page Range", comment: "")
-        self.titleLabel.textColor = NSColor(hex: "#616469")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.titleLabel.font = .SFProTextSemiboldFont(12)
     }
 }

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertSettingLimitTipView.swift

@@ -70,7 +70,7 @@ class KMConvertSettingLimitTipView: NSView {
         self._textField.stringValue = NSLocalizedString("Convert the first 10 pages for free", comment: "")
         self._textField.font = .SFProTextRegularFont(12)
         self._textField.textColor = KMAppearance.titleColor()
-        self._textField.textColor = NSColor(hex: "#F3465B")
+        self._textField.textColor = NSColor.km_init(hex: "#F3465B")
         
         self._funcBox.boxType = .custom
         self._funcBox.titlePosition = .noTitle

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertWordSettingView.swift

@@ -59,7 +59,7 @@ class KMConvertWordSettingView: KMConvertSettingView {
         super.initDefaultVlaue()
         
         self.pageSettingTitleLabel.stringValue = NSLocalizedString("Layout Settings", comment: "")
-        self.pageSettingTitleLabel.textColor = NSColor(hex: "#616469")
+        self.pageSettingTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.pageSettingTitleLabel.font = .SFProTextRegularFont(12)
     }
     

+ 2 - 2
PDF Office/PDF Master/Class/PDFTools/ImageToPDF/KMImageToPDFWindowController.swift

@@ -54,14 +54,14 @@ class KMImageToPDFWindowController: NSWindowController {
         self.window?.backgroundColor = NSColor.clear
         
         self.chooseBackgroundView.wantsLayer = true
-        self.chooseBackgroundView.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
+        self.chooseBackgroundView.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
         
         self.batchPrecessingView.delegate = self
         self.batchPrecessingView.inputType = self.inputType
         self.chooseView.delegate = self
         
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(16.0)
-        self.titleLabel.textColor = NSColor(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in
             if mouseEntered {

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/SelectedFiles/KMBatchSelectedFilesView.swift

@@ -31,11 +31,11 @@ class KMBatchSelectedFilesView: KMBaseXibView {
         
         self.registerForDraggedTypes([NSPasteboard.PasteboardType.string, NSPasteboard.PasteboardType.fileURL]) //支持拖拽
         
-        self.titleLabel.textColor = NSColor.init(hex: "#616469")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.titleLabel.stringValue = NSLocalizedString("Selected files", comment: "")
         
-        self.subtitleLabel.textColor = NSColor.init(hex: "#94989C")
+        self.subtitleLabel.textColor = NSColor.km_init(hex: "#94989C")
         self.subtitleLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.subtitleLabel.stringValue = NSLocalizedString("Drop files here or Click “+”. Drag files to reorder as you need.\nYou can also add files or folders via the lower left button.", comment: "")
         
@@ -43,7 +43,7 @@ class KMBatchSelectedFilesView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .center
-        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor(hex: "#94989C"), NSAttributedString.Key.font: NSFont.SFProTextRegularFont(12)])
+        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor.km_init(hex: "#94989C"), NSAttributedString.Key.font: NSFont.SFProTextRegularFont(12)])
         
         self.box.moveCallback = { [unowned self] mouseEntered, mouseBox in
             if mouseEntered {

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingColumnHeaderCell.swift

@@ -34,7 +34,7 @@ class KMBatchProcessingColumnHeaderCell: NSTableHeaderCell {
         titleRect.origin.x += 24
         titleRect.origin.y += 8
         
-        let attributes = [NSAttributedString.Key.foregroundColor: NSColor.init(hex: "#616469"),
+        let attributes = [NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#616469"),
                           NSAttributedString.Key.font: NSFont.SFProTextSemiboldFont(12.0)]
         
         

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNameTableCell.swift

@@ -51,7 +51,7 @@ class KMBatchProcessingNameTableCell: KMBatchProcessingTableCell {
     override func setup() {
         super.setup()
 
-        self.nameLabel.textColor = NSColor.init(hex: "#252629")
+        self.nameLabel.textColor = NSColor.km_init(hex: "#252629")
         self.nameLabel.font = NSFont.SFProTextRegularFont(14.0)
         
     }

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingOrderTableCell.swift

@@ -52,11 +52,11 @@ class KMBatchProcessingOrderTableCell: KMBatchProcessingTableCell {
         array.removeObject(KMPrintPageRange.PageRangeType.currentPage.rawValue)
         
         self.orderButton.data = array
-        self.orderButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
+        self.orderButton.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
         self.orderButton.stringValue = NSLocalizedString(self.model.pageRange.type.rawValue, comment: "")
         self.orderButton.font = NSFont.SFProTextRegularFont(12.0)
-        self.orderButton.textColor = NSColor.init(hex: "#252629")
-        self.orderButton.backgroundColor(NSColor.init(hex: "FFFFFF"))
+        self.orderButton.textColor = NSColor.km_init(hex: "#252629")
+        self.orderButton.backgroundColor(NSColor.km_init(hex: "FFFFFF"))
         self.orderButton.mouseDownAction = {[unowned self] (button, itemString) in
             self.model.pageRange.type = KMPrintPageRange.PageRangeType.typeOfRawValue(itemString)
             self.orderButton.stringValue = itemString

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingSizeTableCell.swift

@@ -48,7 +48,7 @@ class KMBatchProcessingSizeTableCell: KMBatchProcessingTableCell {
     override func setup() {
         super.setup()
         
-        self.sizeLabel.textColor = NSColor.init(hex: "#94989C")
+        self.sizeLabel.textColor = NSColor.km_init(hex: "#94989C")
         self.sizeLabel.font = NSFont.SFProTextRegularFont(14.0)
         
     }

+ 6 - 6
PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingTableRowView.swift

@@ -38,7 +38,7 @@ class KMBatchProcessingTableRowView: NSTableRowView {
             self.box?.wantsLayer = true
             self.box = KMBox(frame: rect)
             self.box?.borderWidth = 1
-            self.box?.borderColor = NSColor(hex: "#CED0D4")
+            self.box?.borderColor = NSColor.km_init(hex: "#CED0D4")
             self.box?.layer?.cornerRadius = 4
             self.box?.boxType = .custom
             self.addSubview(self.box!, positioned: NSWindow.OrderingMode.below, relativeTo: self)
@@ -51,7 +51,7 @@ class KMBatchProcessingTableRowView: NSTableRowView {
             self.contentBox = KMBox(frame: rect)
             self.contentBox?.boxType = .custom
             self.contentBox?.borderWidth = 0
-            self.contentBox?.borderColor = NSColor(hex: "#CED0D4")
+            self.contentBox?.borderColor = NSColor.km_init(hex: "#CED0D4")
             self.contentBox?.layer?.cornerRadius = 0
             self.addSubview(self.contentBox!, positioned: NSWindow.OrderingMode.above, relativeTo: self)
             
@@ -76,7 +76,7 @@ class KMBatchProcessingTableRowView: NSTableRowView {
         arrow.move(to: CGPoint(x: 16, y: 0))
         arrow.line(to: CGPoint(x: dirtyRect.width - 16, y: 0))
         arrow.close()
-        NSColor.init(hex: "#000000").withAlphaComponent(0.1).set()
+        NSColor.km_init(hex: "#000000").withAlphaComponent(0.1).set()
         arrow.stroke()
         NSColor.green.setFill()
         arrow.fill()
@@ -87,13 +87,13 @@ class KMBatchProcessingTableRowView: NSTableRowView {
 //        self.drawView()
     }
     
-    func drawView(_ color: NSColor = NSColor(hex: "#CED0D4", alpha: 0.6)) {
+    func drawView(_ color: NSColor = NSColor.km_init(hex: "#CED0D4", alpha: 0.6)) {
         if model.select {
-            self.box?.backgroundColor(NSColor(hex: "#CED0D4", alpha: 0.6))
+            self.box?.backgroundColor(NSColor.km_init(hex: "#CED0D4", alpha: 0.6))
             self.box?.borderWidth = 1
             self.box?.layer?.cornerRadius = 4
         } else if model.hover {
-            self.box?.backgroundColor(NSColor(hex: "#EDEEF0"))
+            self.box?.backgroundColor(NSColor.km_init(hex: "#EDEEF0"))
             self.box?.borderWidth = 1
             self.box?.layer?.cornerRadius = 4
         } else {

+ 17 - 17
PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMImageToPDFChooseView/KMImageToPDFChooseView.swift

@@ -82,50 +82,50 @@ class KMImageToPDFChooseView: KMBaseXibView {
         super.updateUI()
         
         self.wantsLayer = true
-        self.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
+        self.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
         
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(16.0)
-        self.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.exportTitleLable.font = NSFont.SFProTextRegularFont(12.0)
-        self.exportTitleLable.textColor = NSColor.init(hex: "#616469")
+        self.exportTitleLable.textColor = NSColor.km_init(hex: "#616469")
         
         self.OCRTilteLable.font = NSFont.SFProTextRegularFont(12.0)
-        self.OCRTilteLable.textColor = NSColor.init(hex: "#616469")
+        self.OCRTilteLable.textColor = NSColor.km_init(hex: "#616469")
         
         self.exportSelectFileLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.exportSelectFileLabel.textColor = NSColor.init(hex: "#94989C")
+        self.exportSelectFileLabel.textColor = NSColor.km_init(hex: "#94989C")
         
-        self.filePathContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.filePathContentView.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         self.filePathContentView.border()
         
-        self.fileImageContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.fileImageContentView.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         self.fileImageContentView.border()
         
         self.selectLanguageLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.selectLanguageLabel.textColor = NSColor.init(hex: "#252629")
+        self.selectLanguageLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.newPDFButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.newPDFButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.newPDFButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.mergePDFButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.mergePDFButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.mergePDFButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.insertPDFButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.insertPDFButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.insertPDFButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.needRecognitionButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.needRecognitionButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.needRecognitionButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
 
         
         self.saveTXTButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
-        self.saveTXTButton.titleLabel.textColor = NSColor.init(hex: "#252629")
+        self.saveTXTButton.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.exportPDFButton.wantsLayer = true
         self.exportPDFButton.layer?.cornerRadius = 4
-        self.exportPDFButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
+        self.exportPDFButton.contentTintColor = NSColor.km_init(hex: "#FFFFFF")
         self.exportPDFButton.font = NSFont.SFProTextRegularFont(14.0)
-        self.exportPDFButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
+        self.exportPDFButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
     }
     
     override func updateLanguage() {
@@ -205,10 +205,10 @@ class KMImageToPDFChooseView: KMBaseXibView {
         }
         
         if (self.data.imageFilePaths?.count != 0) {
-            self.exportPDFButton.layer?.backgroundColor = NSColor.init(hex: "#1770F4").cgColor
+            self.exportPDFButton.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4").cgColor
             self.exportPDFButton.isEnabled = true
         } else {
-            self.exportPDFButton.layer?.backgroundColor = NSColor.init(hex: "#BDDFFD").cgColor
+            self.exportPDFButton.layer?.backgroundColor = NSColor.km_init(hex: "#BDDFFD").cgColor
             self.exportPDFButton.isEnabled = false
         }
     }

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -115,7 +115,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.thumbnailView.collectionView.backgroundColor(NSColor(hex: "#CED0D4"))
+        self.thumbnailView.collectionView.backgroundColor(NSColor.km_init(hex: "#CED0D4"))
         
         var allowedFileTypes: [String] = []
         if let _types = KMConvertPDFManagerOC.supportFileType() as? [String] {
@@ -127,7 +127,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
         
         let toolBar = self.toolBar
         self.topBarBox.contentView = toolBar
-        self.topBarBox.fillColor = NSColor(hex: "#F7F8FA")
+        self.topBarBox.fillColor = NSColor.km_init(hex: "#F7F8FA")
         toolBar.itemClick = { [unowned self] item, index in
             guard let type = KMPageEditType(rawValue: index) else {
                 if (index == KMPageEditType.insert_files) {
@@ -869,7 +869,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
         let selectedIndexs = self.thumbnailView.selectionIndexPaths
         if (selectedIndexs.count < 2 ) {
             let alertView = CustomAlertView(message: NSLocalizedString("Please select at least two pages for editing first", comment: ""), from: self.thumbnailView, with: .blue)
-            alertView?.layer?.backgroundColor = NSColor(hex: "#36383B").cgColor
+            alertView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
             alertView?.layer?.cornerRadius = 4
             return
         }

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPDFEditToolbar.swift

@@ -333,7 +333,7 @@ extension KMPDFEditToolbar: KMNewToolbarDelegate {
             view.frame = item!.bounds
             view.autoresizingMask = [.width,.height]
             view.wantsLayer = true
-            view.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
+            view.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
             
             let comBoxView = KMDesignSelect(withType: .Combox)
             view.addSubview(comBoxView.view)

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditInsertDirectionItemView.swift

@@ -30,7 +30,7 @@ class KMPageEditInsertDirectionItemView: KMPageEditBaseItemView {
         
         self.titleLabel.stringValue = NSLocalizedString("Direction", comment: "")
         self.titleLabel.font = .SFProTextSemiboldFont(12)
-        self.titleLabel.textColor = NSColor(hex: "#616469")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#616469")
         
         self.horVC?.state = .Norm
         self.verVC?.state = .Checked

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditInsertPageSizeItemView.swift

@@ -139,7 +139,7 @@ class KMPageEditInsertPageSizeItemView: KMPageEditBaseItemView {
         
         self.titleLabel.stringValue = NSLocalizedString("Page Size", comment: "")
         self.titleLabel.font = .SFProTextSemiboldFont(12)
-        self.titleLabel.textColor = NSColor(hex: "#616469")
+        self.titleLabel.textColor = NSColor.km_init(hex: "#616469")
         
         self.customSize = NSSize(width: 210, height: 297)
         self.cwTextField?.stringValue = "\(self.customSize.width)"

+ 0 - 0
PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditThumbnailItem.swift


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio