【兼容】

• NSFont. SFProTextRegular
• NSFont. SFProTextSemibold

PDF Office/PDF Master/Class/ChromiumTabs/KMToolbarRightView.swift

@@ -58,7 +58,7 @@ import Cocoa
             if self.advancedLabel != nil {
                 self.advancedContentView.isHidden = false
                 self.advancedViewRightConstraint.constant = 8.0
-                self.advancedLabel.font = NSFont.SFProTextRegular(12.0)
+                self.advancedLabel.font = NSFont.SFProTextRegularFont(12.0)
                 self.advancedLabel.textColor = NSColor(hex: "#FFFFFF")
                 
                 var advancedString = NSLocalizedString("Upgrade", comment: "")
@@ -77,7 +77,7 @@ import Cocoa
         if self.userInfoButton != nil {
             if KMLightMemberManager.manager.info.email.count != 0 {
                 self.userInfoButton.backgroundColor(NSColor(hex: "#1770F4"))
-                self.userInfoButton.font = NSFont.SFProTextSemibold(14.0)
+                self.userInfoButton.font = NSFont.SFProTextSemiboldFont(14.0)
                 self.userInfoButton.contentTintColor = NSColor(hex: "#FFFFFF")
                 self.userInfoButton.border(NSColor(hex: "#1770F4"), 1, 12)
                 self.userInfoButton.title = KMLightMemberManager.manager.info.email.substring(to: 1)
@@ -115,7 +115,7 @@ import Cocoa
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .right
         let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle,
-                          NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0)]
+                          NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0)]
         let title: NSString = advancedString as NSString
         let size = title.boundingRect(with: CGSize(width: 300, height: 24) ,
                                       attributes: attributes).size

PDF Office/PDF Master/Class/Home/ViewController/KMAILanguagePopVC.swift

@@ -24,7 +24,7 @@ class KMAILanguagePopTableviewCell: NSTableCellView {
         
         self.mainBox.fillColor = .clear
         self.languageLabel.textColor = NSColor(hex: "#252629")
-        self.languageLabel.font = NSFont.SFProTextRegular(14.0)
+        self.languageLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.mainBox.moveCallback =  { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if !self.isSelect {

PDF Office/PDF Master/Class/Home/ViewController/KMAIOpenPDFFilesVC.swift

@@ -45,26 +45,26 @@ class KMAIOpenPDFFilesVC: NSViewController {
     
     func initializeUI() -> Void {
         self.openPDFFilesLabel.textColor = NSColor(hex: "#252629")
-        self.openPDFFilesLabel.font = NSFont.SFProTextSemibold(20.0)
+        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.selectYourFilesLabel.font = NSFont.SFProTextRegular(16.0)
+        self.selectYourFilesLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.selectYourFilesImageView.image = NSImage(named: "icon_SelectYourFiles")
         self.orDropFilesHereToOpenLabel.textColor = NSColor(hex: "#616469")
-        self.orDropFilesHereToOpenLabel.font = NSFont.SFProTextRegular(14.0)
+        self.orDropFilesHereToOpenLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.creatPDFLabel.textColor = NSColor(hex: "#252629")
-        self.creatPDFLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.creatPDFLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         self.newFromFilesLabel.textColor = NSColor(hex: "#252629")
-        self.newFromFilesLabel.font = NSFont.SFProTextRegular(16.0)
+        self.newFromFilesLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.newFromFilesImageView.image = NSImage(named: "icon_empty_NewFromFiles")
         self.newBlankPageLabel.textColor = NSColor(hex: "#252629")
-        self.newBlankPageLabel.font = NSFont.SFProTextRegular(16.0)
+        self.newBlankPageLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.newBlankPageImageView.image = NSImage(named: "icon_empty_NewBlackPage")
         self.importFromScannerLabel.textColor = NSColor(hex: "#252629")
-        self.importFromScannerLabel.font = NSFont.SFProTextRegular(16.0)
+        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

PDF Office/PDF Master/Class/Home/ViewController/KMAIRewritingVC.swift

@@ -62,31 +62,31 @@ class KMAIRewritingVC: NSViewController {
     
     func initializeUI() -> Void {
         self.aiRewritingLabel.textColor = NSColor(hex: "#252629")
-        self.aiRewritingLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.aiRewritingLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         self.aiRewritingSubLabel.textColor = NSColor(hex: "#94989C")
-        self.aiRewritingSubLabel.font = NSFont.SFProTextRegular(14.0)
+        self.aiRewritingSubLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.rewritingBox.fillColor = NSColor(hex: "#BDDFFD")
         self.rewritingBox.cornerRadius = 4.0
         self.rewritingLabel.textColor = NSColor(hex: "#F7F8FA")
-        self.rewritingLabel.font = NSFont.SFProTextRegular(14.0)
+        self.rewritingLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.rewritingTextBox.borderColor = NSColor(hex: "#1770F4")
         self.wordsLabel.textColor = NSColor(hex: "#94989C")
-        self.wordsLabel.font = NSFont.SFProTextRegular(14.0)
+        self.wordsLabel.font = NSFont.SFProTextRegularFont(14.0)
 
         self.resultLabel.textColor = NSColor(hex: "#252629")
-        self.resultLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.resultLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
         self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
         self.copyBox.cornerRadius = 4.0
         self.copyBox.borderWidth = 1.0
         self.copyLabel.textColor = NSColor(hex: "#B1B3B8")
-        self.copyLabel.font = NSFont.SFProTextRegular(14.0)
+        self.copyLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.resultTextBox.borderColor = NSColor(hex: "#DFE1E5")
         
         self.errorView.isHidden = true
         self.errorImageView.image = NSImage(named: "icon_error")
         self.errorLabel.textColor = NSColor(hex: "#F3465B")
-        self.errorLabel.font = NSFont.SFProTextRegular(12.0)
+        self.errorLabel.font = NSFont.SFProTextRegularFont(12.0)
         
 //        if self.state == .AIRewriting {
 //            self.emptyImageView.image = NSImage(named: "ic_ai_rewriting_empty")

PDF Office/PDF Master/Class/Home/ViewController/KMAITranslationVC.swift

@@ -60,20 +60,20 @@ class KMAITranslationVC: NSViewController {
         self.aiTranslationView.canHover = false
 
         self.aiTranslationLabel.textColor = NSColor(hex: "#252629")
-        self.aiTranslationLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.aiTranslationLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         
         self.supportPDFWordFileImageView.image = NSImage(named: "ic_function_other")
         self.supportPDFWordFileLabel.textColor = NSColor(hex: "#252629")
-        self.supportPDFWordFileLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.supportPDFWordFileLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         self.supportPDFWordFileSubLabel.textColor = NSColor(hex: "#94989C")
-        self.supportPDFWordFileSubLabel.font = NSFont.SFProTextRegular(14.0)
+        self.supportPDFWordFileSubLabel.font = NSFont.SFProTextRegularFont(14.0)
 
         self.translationLanguageLabel.textColor = NSColor(hex: "#252629")
-        self.translationLanguageLabel.font = NSFont.SFProTextRegular(14.0)
+        self.translationLanguageLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.automaticLabel.textColor = NSColor(hex: "#252629")
-        self.automaticLabel.font = NSFont.SFProTextRegular(16.0)
+        self.automaticLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.languageLabel.textColor = NSColor(hex: "#252629")
-        self.languageLabel.font = NSFont.SFProTextRegular(16.0)
+        self.languageLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.automaticBox.cornerRadius = 4.0
         self.automaticBox.borderColor = NSColor(hex: "#DFE1E5")
         self.languageBox.cornerRadius = 4.0
@@ -93,11 +93,11 @@ class KMAITranslationVC: NSViewController {
         self.selectYourFilesBox.cornerRadius = 4.0
         self.selectYourFilesBox.fillColor = NSColor(hex: "#1770F4")
         self.selectYourFilesLabel.textColor = NSColor(hex: "#FFFFFF")
-        self.selectYourFilesLabel.font = NSFont.SFProTextRegular(16.0)
+        self.selectYourFilesLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.selectYourFilesImageView.image = NSImage(named: "icon_SelectYourFiles")
         
         self.orDropFileHereLabel.textColor = NSColor(hex: "#616469")
-        self.orDropFileHereLabel.font = NSFont.SFProTextRegular(14.0)
+        self.orDropFileHereLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.selectYourFilesBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if mouseEntered {
@@ -137,7 +137,7 @@ class KMAITranslationVC: NSViewController {
         self.errorView.layer?.backgroundColor = NSColor(hex: "##36383B").cgColor
         self.errorView.layer?.cornerRadius = 4.0
         self.errorLabel.textColor = NSColor(hex: "#FFFFFF")
-        self.errorLabel.font = NSFont.SFProTextRegular(14.0)
+        self.errorLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     private func _selectFiles() {

PDF Office/PDF Master/Class/Home/ViewController/KMHomePopViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -369,7 +369,7 @@ import KMAdvertisement
         self.aiHomeImageView.image = NSImage(named: "icon_home")
         self.aiHomeLabel.stringValue = NSLocalizedString("Home", comment: "")
         self.aiHomeLabel.textColor = NSColor(hex: "#252629")
-        self.aiHomeLabel.font = NSFont.SFProTextRegular(16.0)
+        self.aiHomeLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiHomeBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if aiHomeState != .Home {
                 if mouseEntered {
@@ -394,7 +394,7 @@ import KMAdvertisement
         self.aiTranslationImageView.image = NSImage(named: "ic_function_other")
         self.aiTranslationLabel.stringValue = NSLocalizedString("AI Translation", comment: "")
         self.aiTranslationLabel.textColor = NSColor(hex: "#252629")
-        self.aiTranslationLabel.font = NSFont.SFProTextRegular(16.0)
+        self.aiTranslationLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiTranslationBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if aiHomeState != .AITranslation {
                 if mouseEntered {
@@ -421,7 +421,7 @@ import KMAdvertisement
         self.aiRewritingImageView.image = NSImage(named: "ic_ai_Rewriting")
         self.aiRewritingLabel.stringValue = NSLocalizedString("AI Rewriting", comment: "")
         self.aiRewritingLabel.textColor = NSColor(hex: "#252629")
-        self.aiRewritingLabel.font = NSFont.SFProTextRegular(16.0)
+        self.aiRewritingLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiRewritingBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if aiHomeState != .AIRewriting {
                 if mouseEntered {
@@ -448,7 +448,7 @@ import KMAdvertisement
         self.aiErrorCorrectionImageView.image = NSImage(named: "ic_ai_ErrorCorrection")
         self.aiErrorCorrectionLabel.stringValue = NSLocalizedString("AI Error Correction", comment: "")
         self.aiErrorCorrectionLabel.textColor = NSColor(hex: "#252629")
-        self.aiErrorCorrectionLabel.font = NSFont.SFProTextRegular(16.0)
+        self.aiErrorCorrectionLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiErrorCorrectionBox.moveCallback = { [unowned self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             if aiHomeState != .AIErrorCorrection {
                 if mouseEntered {
@@ -525,13 +525,13 @@ import KMAdvertisement
     
     func refreshAIUI() -> Void {
         self.aiHomeBox.fillColor = .clear
-        self.aiHomeLabel.font = NSFont.SFProTextRegular(16.0)
+        self.aiHomeLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiTranslationBox.fillColor = .clear
-        self.aiTranslationLabel.font = NSFont.SFProTextRegular(16.0)
+        self.aiTranslationLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiRewritingBox.fillColor = .clear
-        self.aiRewritingLabel.font = NSFont.SFProTextRegular(16.0)
+        self.aiRewritingLabel.font = NSFont.SFProTextRegularFont(16.0)
         self.aiErrorCorrectionBox.fillColor = .clear
-        self.aiErrorCorrectionLabel.font = NSFont.SFProTextRegular(16.0)
+        self.aiErrorCorrectionLabel.font = NSFont.SFProTextRegularFont(16.0)
 
         rightFullBox.isHidden = true
         rightTopBox.isHidden = true
@@ -540,7 +540,7 @@ import KMAdvertisement
         switch self.aiHomeState {
         case .Home:
             self.aiHomeBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
-            self.aiHomeLabel.font = NSFont.SFProTextSemibold(16.0)
+            self.aiHomeLabel.font = NSFont.SFProTextSemiboldFont(16.0)
             
             self.rightTopBox.isHidden = false
             self.rightBottomBox.isHidden = false
@@ -555,7 +555,7 @@ import KMAdvertisement
         case .AITranslation:
             self.aiTranslationBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
             self.aiTranslationLabel.textColor = NSColor(hex: "#252629")
-            self.aiTranslationLabel.font = NSFont.SFProTextSemibold(16.0)
+            self.aiTranslationLabel.font = NSFont.SFProTextSemiboldFont(16.0)
 
             self.rightFullBox.isHidden = false
             self.rightTopBox.contentView = nil
@@ -567,7 +567,7 @@ import KMAdvertisement
         case .AIRewriting:
             self.aiRewritingBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
             self.aiRewritingLabel.textColor = NSColor(hex: "#252629")
-            self.aiRewritingLabel.font = NSFont.SFProTextSemibold(16.0)
+            self.aiRewritingLabel.font = NSFont.SFProTextSemiboldFont(16.0)
 
             self.rightFullBox.isHidden = false
             self.rightTopBox.contentView = nil
@@ -582,7 +582,7 @@ import KMAdvertisement
         case .AIErrorCorrection:
             self.aiErrorCorrectionBox.fillColor = NSColor(hex: "#1770F4", alpha: 0.1)
             self.aiErrorCorrectionLabel.textColor = NSColor(hex: "#252629")
-            self.aiErrorCorrectionLabel.font = NSFont.SFProTextSemibold(16.0)
+            self.aiErrorCorrectionLabel.font = NSFont.SFProTextSemiboldFont(16.0)
 
             self.rightFullBox.isHidden = false
             self.rightTopBox.contentView = nil

PDF Office/PDF Master/Class/Home/WindowController/KMAITranslationConfirmWindowController.swift

@@ -63,36 +63,36 @@ class KMAITranslationConfirmWindowController: NSWindowController {
     
     func initializeUI() -> Void {
         self.label.textColor = NSColor(hex: "#252629")
-        self.label.font = NSFont.SFProTextSemibold(16.0)
+        self.label.font = NSFont.SFProTextSemiboldFont(16.0)
         
         self.subLabel.textColor = NSColor(hex: "##616469")
-        self.subLabel.font = NSFont.SFProTextRegular(12.0)
+        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.fromLabel.font = NSFont.SFProTextRegular(14.0)
+        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.toLabel.font = NSFont.SFProTextRegular(14.0)
+        self.toLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.languageImageView.image = NSImage(named: "ic_transtate")
         
         self.tipsLabel1.textColor = NSColor(hex: "#94989C")
-        self.tipsLabel1.font = NSFont.SFProTextRegular(12.0)
+        self.tipsLabel1.font = NSFont.SFProTextRegularFont(12.0)
         self.tipsLabel2.textColor = NSColor(hex: "#94989C")
-        self.tipsLabel2.font = NSFont.SFProTextRegular(12.0)
+        self.tipsLabel2.font = NSFont.SFProTextRegularFont(12.0)
 
         self.cancelBox.fillColor = NSColor(hex: "#F5F5F5")
         self.cancelBox.cornerRadius = 5.0
         self.cancelBox.borderWidth = 0.0
         self.cancelLabel.textColor = NSColor(hex: "#4D4D4D")
-        self.cancelLabel.font = NSFont.SFProTextRegular(13.0)
+        self.cancelLabel.font = NSFont.SFProTextRegularFont(13.0)
         self.translateBox.fillColor = NSColor(hex: "#4B91F7")
         self.translateBox.cornerRadius = 5.0
         self.translateBox.borderWidth = 0.0
         self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
-        self.translateLabel.font = NSFont.SFProTextRegular(13.0)
+        self.translateLabel.font = NSFont.SFProTextRegularFont(13.0)
         
         self.prePDFView?.backgroundColor = NSColor(hex: "#F7F8FA")
     }

PDF Office/PDF Master/Class/Home/WindowController/KMAITranslationWindowController.swift

@@ -72,47 +72,47 @@ class KMAITranslationWindowController: NSWindowController {
     
     func initializeUI() -> Void {
         self.aiTranslationTitleLabel.textColor = NSColor(hex: "#252629")
-        self.aiTranslationTitleLabel.font = NSFont.SFProTextSemibold(16.0)
+        self.aiTranslationTitleLabel.font = NSFont.SFProTextSemiboldFont(16.0)
         self.translationLanguage.textColor = NSColor(hex: "#252629")
-        self.translationLanguage.font = NSFont.SFProTextRegular(14.0)
+        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.fromLabel.font = NSFont.SFProTextRegular(14.0)
+        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.toLabel.font = NSFont.SFProTextRegular(14.0)
+        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.fromContentTextField.font = NSFont.SFProTextRegular(12.0)
+        self.fromContentTextField.font = NSFont.SFProTextRegularFont(12.0)
         self.fromContentLabel.textColor = NSColor(hex: "#94989C")
-        self.fromContentLabel.font = NSFont.SFProTextRegular(12.0)
+        self.fromContentLabel.font = NSFont.SFProTextRegularFont(12.0)
 
         self.toContentBox.borderColor = NSColor(hex: "#DFE1E5")
         self.toContentBox.fillColor = NSColor(hex: "#FFFFFF")
         self.toContentTextView.textColor = .black
-        self.toContentTextView.font = NSFont.SFProTextRegular(12.0)
+        self.toContentTextView.font = NSFont.SFProTextRegularFont(12.0)
         
         self.translateBox.fillColor = NSColor(hex: "#BDDFFD")
         self.translateBox.cornerRadius = 4.0
         self.translateLabel.textColor = NSColor(hex: "#FFFFFF")
-        self.translateLabel.font = NSFont.SFProTextRegular(12.0)
+        self.translateLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.copyBox.fillColor = NSColor(hex: "#EDEEF0")
         self.copyBox.borderColor = NSColor(hex: "#DFE1E5")
         self.copyBox.borderWidth = 1.0
         self.copyBox.cornerRadius = 4.0
         self.copyLabel.textColor = NSColor(hex: "#F7F8FA")
-        self.copyLabel.font = NSFont.SFProTextRegular(12.0)
+        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.font = NSFont.SFProTextRegular(12.0)
+        self.errorLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         if self.content.count > 0 {
             self.fromContentTextField.stringValue = self.content

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

@@ -80,41 +80,41 @@ class KMAccountInfoView: KMBaseXibView {
         super.updateUI()
         
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         
         self.accountLabel.textColor = NSColor(hex: "#252629")
-        self.accountLabel.font = NSFont.SFProTextRegular(14.0)
+        self.accountLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.accountDescribeLabel.textColor = NSColor(hex: "#616469")
-        self.accountDescribeLabel.font = NSFont.SFProTextSemibold(12.0)
+        self.accountDescribeLabel.font = NSFont.SFProTextSemiboldFont(12.0)
         
         self.imageViewButton.backgroundColor(NSColor(hex: "#1770F4"))
-        self.imageViewButton.font = NSFont.SFProTextSemibold(28.0)
+        self.imageViewButton.font = NSFont.SFProTextSemiboldFont(28.0)
         self.imageViewButton.contentTintColor = NSColor(hex: "#FFFFFF")
         self.imageViewButton.border(NSColor(hex: "#1770F4"), 1, 24)
         
         self.infoContentView.backgroundColor(NSColor(hex: "#F7F8FA"))
         self.infoContentView.border(NSColor(hex: "#F7F8FA"), 0, 6)
         
-        self.purchaseInfoButton.font = NSFont.SFProTextRegular(14)
+        self.purchaseInfoButton.font = NSFont.SFProTextRegularFont(14)
         self.purchaseInfoButton.contentTintColor = NSColor(hex: "#1770F4")
         
 
         self.statusTitleLabel.textColor = NSColor(hex: "#616469")
-        self.statusTitleLabel.font = NSFont.SFProTextRegular(12.0)
+        self.statusTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
  
         self.statusLabel.textColor = NSColor(hex: "#252629")
-        self.statusLabel.font = NSFont.SFProTextSemibold(16.0)
+        self.statusLabel.font = NSFont.SFProTextSemiboldFont(16.0)
         
         self.statusTimeLabel.textColor = NSColor(hex: "#616469")
-        self.statusTimeLabel.font = NSFont.SFProTextRegular(12.0)
+        self.statusTimeLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.subscribeButton.contentTintColor = NSColor(hex: "#FFFFFF")
         self.subscribeButton.backgroundColor(NSColor(hex: "#FF852E"))
-        self.subscribeButton.font = NSFont.SFProTextRegular(16)
+        self.subscribeButton.font = NSFont.SFProTextRegularFont(16)
         self.subscribeButton.border(NSColor.clear, 0, 20)
         
-        self.tagLabel.font = NSFont.SFProTextRegular(12)
+        self.tagLabel.font = NSFont.SFProTextRegularFont(12)
         self.tagLabel.textColor = NSColor(hex: "#252629")
         
         self.tagContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)

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

@@ -36,10 +36,10 @@ class KMCancellationSuccessView: KMBaseXibView {
             }
         }
         
-        self.titleLabel.font = NSFont.SFProTextSemibold(19.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(19.0)
         self.titleLabel.textColor = NSColor(hex: "#252629")
         
-        self.subTitleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.subTitleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.subTitleLabel.textColor = NSColor(hex: "#616469")
         self.subTitleLabel.maximumNumberOfLines = 0
         

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

@@ -51,10 +51,10 @@ class KMComparativeOutlineView: KMBaseXibView {
         super.updateUI()
         
         self.optionTitleLabel.textColor = NSColor(hex: "#616469")
-        self.optionTitleLabel.font = NSFont.SFProTextBold(14.0)
+        self.optionTitleLabel.font = NSFont.SFProTextBoldFont(14.0)
         
         self.optionTitleLabel2.textColor = NSColor(hex: "#616469")
-        self.optionTitleLabel2.font = NSFont.SFProTextBold(14.0)
+        self.optionTitleLabel2.font = NSFont.SFProTextBoldFont(14.0)
     }
     
     override func updateLanguage() {
@@ -67,13 +67,13 @@ class KMComparativeOutlineView: KMBaseXibView {
         let attributedString = NSMutableAttributedString.init(string: string)
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .left
-        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextBold(26.0),
+        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextBoldFont(26.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(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.SFProTextBold(26.0),
+        attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextBoldFont(26.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "register://"],

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

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

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

@@ -72,7 +72,7 @@ class KMComparativeOutlineSectionCell: NSTableCellView {
     
     func updateUI() {
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextSemibold(14.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(14.0)
     }
     
     func updateLanguage() {

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

@@ -136,18 +136,18 @@ class KMComparativeView: KMBaseXibView {
         self.contentView.addSubview(self.imageView, positioned: .below, relativeTo: self.topView)
         
         self.restoreButton.contentTintColor = NSColor(hex: "#1770F4")
-        self.restoreButton.font = NSFont.SFProTextRegular(16)
+        self.restoreButton.font = NSFont.SFProTextRegularFont(16)
         
         self.privacyPolicyButton.contentTintColor = NSColor(hex: "#1770F4")
-        self.privacyPolicyButton.font = NSFont.SFProTextRegular(12)
+        self.privacyPolicyButton.font = NSFont.SFProTextRegularFont(12)
         
         self.lineView.backgroundColor(NSColor(hex: "#000000").withAlphaComponent(0.1))
         
         self.termsServiceButton.contentTintColor = NSColor(hex: "#1770F4")
-        self.termsServiceButton.font = NSFont.SFProTextRegular(12)
+        self.termsServiceButton.font = NSFont.SFProTextRegularFont(12)
         
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextSemibold(24)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(24)
         
         self.setupPopover()
     }
@@ -190,7 +190,7 @@ Payment will be charged to your Apple ID account at the confirmation of purchase
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.4
         paragraphStyle.alignment = .left
-        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegular(12), NSAttributedString.Key.paragraphStyle : paragraphStyle]
+        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12), NSAttributedString.Key.paragraphStyle : paragraphStyle]
         var size: NSSize = string.boundingRect(with: NSSize(width: 420, height: 600), options: NSString.DrawingOptions(rawValue: 3), attributes: attributes).size
         size = CGSize(width: size.width, height: size.height + 30)
         

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

@@ -42,13 +42,13 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
     func setup() {
         self.view.border(NSColor(hex: "#E2E2E2"), 1, 10)
         
-        self.titleLabel.font = NSFont.SFProTextSemibold(20)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(20)
         self.titleLabel.textColor = NSColor(hex: "#252629")
         
-        self.subtitleLabel.font = NSFont.SFProTextSemibold(32)
+        self.subtitleLabel.font = NSFont.SFProTextSemiboldFont(32)
         self.subtitleLabel.textColor = NSColor(hex: "#616469")
         
-        self.describeLabel.font = NSFont.SFProTextRegular(14)
+        self.describeLabel.font = NSFont.SFProTextRegularFont(14)
         self.describeLabel.textColor = NSColor(hex: "#616469")
         
         self.lineView.backgroundColor(NSColor(hex: "#ECECEC"))
@@ -135,7 +135,7 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
                 self.doneContentView.backgroundColor(NSColor(hex: "#FF852E"))
                 self.doneContentView.border(NSColor(hex: "#FF852E"), 0, 20)
                 self.doneButton.textColor = NSColor(hex: "#FFFFFF")
-                self.doneButton.font = NSFont.SFProTextSemibold(16)
+                self.doneButton.font = NSFont.SFProTextSemiboldFont(16)
                 self.describeLabel.stringValue = "Save 50% for the first year, auto-renew at $79.9. Billed yearly."
                 
                 self.updatePrice()
@@ -148,7 +148,7 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
                 self.doneContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
                 self.doneContentView.border(NSColor(hex: "#DFE1E5"), 1, 20)
                 self.doneButton.textColor = NSColor(hex: "#252629")
-                self.doneButton.font = NSFont.SFProTextRegular(16)
+                self.doneButton.font = NSFont.SFProTextRegularFont(16)
                 if KMLightMemberManager.manager.isLogin() {
                     self.doneContentView.isHidden = true
                 } else {
@@ -251,7 +251,7 @@ extension KMComparativeViewCollectionItem: NSCollectionViewDelegateFlowLayout {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .left
-        let size: NSSize = string.boundingRect(with: NSSize(width: 260, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(12), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
+        let size: NSSize = string.boundingRect(with: NSSize(width: 260, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
         return NSSize(width: 284, height: max(20, size.height))
     }
     

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

@@ -19,7 +19,7 @@ class KMComparativeViewCollectionItemItem: NSCollectionViewItem {
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do view setup here.
-        self.titleLabel.font = NSFont.SFProTextRegular(12)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(12)
         self.titleLabel.textColor = NSColor(hex: "#252629")
     }
     

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

@@ -23,10 +23,10 @@ class KMLightNoNetworkView: KMBaseXibView {
         
         self.backgroundColor(NSColor(hex: "#FFFFFF"))
         
-        self.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.titleLabel.textColor = NSColor(hex: "#616469")
         
-        self.subtitleLabel.font = NSFont.SFProTextRegular(12.0)
+        self.subtitleLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.subtitleLabel.textColor = NSColor(hex: "#94989C")
     }
     

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

@@ -51,7 +51,7 @@ class KMLoginInputPasswordView: KMBaseXibView {
         super.setup()
         
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         
         self.emailTextView.delegate = self
         self.emailTextView.isEditable = false
@@ -59,12 +59,12 @@ class KMLoginInputPasswordView: KMBaseXibView {
         self.emailTextView.autoresizingMask = [.width, .height]
         
         self.describeLable.textColor = NSColor(hex: "#252629")
-        self.describeLable.font = NSFont.SFProTextRegular(14.0)
+        self.describeLable.font = NSFont.SFProTextRegularFont(14.0)
         
         self.passwordAlertLabel.textColor = NSColor(hex: "#F3465B")
-        self.passwordAlertLabel.font = NSFont.SFProTextRegular(12.0)
+        self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
         
-        self.forgotPasswordButton.font = NSFont.SFProTextRegular(12.0)
+        self.forgotPasswordButton.font = NSFont.SFProTextRegularFont(12.0)
         self.forgotPasswordButton.contentTintColor = NSColor(hex: "#1770F4")
         
         self.passwordTextField.delegate = self
@@ -121,15 +121,15 @@ class KMLoginInputPasswordView: KMBaseXibView {
         //password
         self.passwordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.passwordTextField.textColor = NSColor(hex: "#252629")
-        self.passwordTextField.font = NSFont.SFProTextRegular(14.0)
+        self.passwordTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.passwordTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
         
         self.passwordSecureTextField.textColor = NSColor(hex: "#252629")
-        self.passwordSecureTextField.font = NSFont.SFProTextRegular(14.0)
+        self.passwordSecureTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.passwordSecureTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
         
         self.passwordAlertLabel.textColor = NSColor(hex: "#F3465B")
-        self.passwordAlertLabel.font = NSFont.SFProTextRegular(12.0)
+        self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
     override func updateLanguage() {
@@ -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.SFProTextRegular(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(hex: "#94989C") ])
         
 
-        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(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(hex: "#94989C") ])
     
         self.passwordAlertLabel.stringValue = NSLocalizedString(KMRequestServerErrorCodeType.typeOfMessage(type: self.model.passwordAlertType), comment: "")
         
@@ -156,13 +156,13 @@ class KMLoginInputPasswordView: KMBaseXibView {
         let attributedString = NSMutableAttributedString.init(string: string)
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .left;
-        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0),
+        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(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.SFProTextRegular(12.0),
+        attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "changeEmail://"],

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

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

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

@@ -63,17 +63,17 @@ class KMLoginView: KMBaseXibView {
         self.backgroundColor(NSColor(hex: "#FFFFFF"))
         
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextRegular(20.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(20.0)
         
         self.loginDescripeLabel.textColor = NSColor(hex: "#252629")
-        self.loginDescripeLabel.font = NSFont.SFProTextRegular(14.0)
+        self.loginDescripeLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.emailTextField.textColor = NSColor(hex: "#252629")
-        self.emailTextField.font = NSFont.SFProTextRegular(14.0)
+        self.emailTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.emailTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
         
         self.alertLabel.textColor = NSColor(hex: "#F3465B")
-        self.alertLabel.font = NSFont.SFProTextRegular(12.0)
+        self.alertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
     override func updateLanguage() {
@@ -84,20 +84,20 @@ class KMLoginView: KMBaseXibView {
         
         self.textFieldContentView.border(NSColor(hex: "#1770F4"), 1, 4)
         
-        self.emailTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter email address", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(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(hex: "#94989C") ])
         
         
         let string = NSLocalizedString("Don’t have an account yet?", comment: "") + "  " + NSLocalizedString("Sign up", comment: "")
         let attributedString = NSMutableAttributedString.init(string: string)
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .center;
-        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0),
+        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(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.SFProTextRegular(12.0),
+        attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "register://"],

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

@@ -52,16 +52,16 @@ class KMRegisterSuccessView: KMBaseXibView {
         self.doneButton.border(.white,0, 20)
         self.doneButton.backgroundColor(NSColor(hex: "#FF852E"))
         self.doneButton.contentTintColor = NSColor(hex: "#FFFFFF")
-        self.doneButton.font = NSFont.SFProTextSemibold(16)
+        self.doneButton.font = NSFont.SFProTextSemiboldFont(16)
         
         self.textView.delegate = self
         self.textView.isEditable = false
         self.textView.frame = (self.textView.enclosingScrollView?.contentView.bounds)!
         self.textView.autoresizingMask = [.width, .height]
         
-        self.label1.font = NSFont.SFProTextRegular(11)
-        self.label2.font = NSFont.SFProTextRegular(11)
-        self.label3.font = NSFont.SFProTextRegular(11)
+        self.label1.font = NSFont.SFProTextRegularFont(11)
+        self.label2.font = NSFont.SFProTextRegularFont(11)
+        self.label3.font = NSFont.SFProTextRegularFont(11)
         
         self.label1.textColor = NSColor(hex: "#252629")
         self.label2.textColor = NSColor(hex: "#252629")
@@ -95,31 +95,31 @@ 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.SFProTextSemibold(20.0)])
+        self.titleLabel.attributedStringValue = NSMutableAttributedString(string: string1, attributes: [NSAttributedString.Key.paragraphStyle: ParagraphStyle1, .foregroundColor : NSColor(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.SFProTextRegular(16.0)])
+        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: string2, attributes: [NSAttributedString.Key.paragraphStyle: titleParagraphStyle2, .foregroundColor : NSColor(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.SFProTextSemibold(14.0)])
+        self.subscribeTitleLabel.attributedStringValue = NSMutableAttributedString(string: string3, attributes: [NSAttributedString.Key.paragraphStyle: titleParagraphStyle3, .foregroundColor : NSColor(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.SFProTextRegular(12.0),
+        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(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.SFProTextRegular(12.0),
+        attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "register://"],

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

@@ -93,7 +93,7 @@ class KMRegisterView: KMBaseXibView {
         self.backgroundColor(NSColor(hex: "#FFFFFF"))
         
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextRegular(20.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(20.0)
         self.titleLabel.stringValue = NSLocalizedString("Sign Up", comment: "")
         
         self.nextButtonVC.stringValue = NSLocalizedString("Next Step", comment: "")
@@ -101,28 +101,28 @@ class KMRegisterView: KMBaseXibView {
         //email
         self.emailContentView.border(NSColor(hex: "#1770F4"), 1, 4)
         self.emailTextField.textColor = NSColor(hex: "#252629")
-        self.emailTextField.font = NSFont.SFProTextRegular(14.0)
-        self.emailTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter email address", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        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.emailAlertTextLabel.textColor = NSColor(hex: "#F3465B")
-        self.emailAlertTextLabel.font = NSFont.SFProTextRegular(12.0)
+        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.passwordTextField.font = NSFont.SFProTextRegular(14.0)
-        self.passwordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        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.passwordSecureTextField.textColor = NSColor(hex: "#252629")
-        self.passwordSecureTextField.font = NSFont.SFProTextRegular(14.0)
-        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter your password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(14.0), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C") ])
+        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.passwordAlertLabel.textColor = NSColor(hex: "#F3465B")
-        self.passwordAlertLabel.font = NSFont.SFProTextRegular(12.0)
+        self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.passwordAlertLabel.stringValue = NSLocalizedString("At least 6 characters", comment: "")
         
         //singin
@@ -130,13 +130,13 @@ class KMRegisterView: KMBaseXibView {
         let attributedString = NSMutableAttributedString.init(string: string)
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .center;
-        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0),
+        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(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.SFProTextRegular(12.0),
+        attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "login://"],
@@ -151,14 +151,14 @@ class KMRegisterView: KMBaseXibView {
         pParagraphStyle.lineHeightMultiple = 1.23
         pParagraphStyle.lineBreakMode = .byWordWrapping
         pParagraphStyle.alignment = .left;
-        pAttributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegular(11.0),
+        pAttributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(11.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(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.SFProTextRegular(11.0),
+            pAttributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(11.0),
                                             NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
                                             NSAttributedString.Key.underlineColor : NSColor.clear,
                                             NSAttributedString.Key.link : "privacy://"],
@@ -167,7 +167,7 @@ class KMRegisterView: KMBaseXibView {
         
         let lRange = pString.range(of: NSLocalizedString("Term Service", comment: ""))
         if lRange != nil {
-            pAttributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegular(11.0),
+            pAttributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(11.0),
                                             NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
                                             NSAttributedString.Key.underlineColor : NSColor.clear,
                                             NSAttributedString.Key.link : "license://"],

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

@@ -48,7 +48,7 @@ class KMResetPasswordView: KMBaseXibView {
         super.setup()
         self.model.logType = .resetPassword
         
-        self.titleLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         self.titleLabel.textColor = NSColor(hex: "#252629")
         
         
@@ -89,28 +89,28 @@ class KMResetPasswordView: KMBaseXibView {
         //password
         self.passwordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.passwordTextField.textColor = NSColor(hex: "#252629")
-        self.passwordTextField.font = NSFont.SFProTextRegular(14.0)
+        self.passwordTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.passwordTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
         
         self.passwordSecureTextField.textColor = NSColor(hex: "#252629")
-        self.passwordSecureTextField.font = NSFont.SFProTextRegular(14.0)
+        self.passwordSecureTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.passwordSecureTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
         
         self.passwordAlertLabel.textColor = NSColor(hex: "#F3465B")
-        self.passwordAlertLabel.font = NSFont.SFProTextRegular(12.0)
+        self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         //repassword
         self.rePasswordContentView.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.rePasswordTextField.textColor = NSColor(hex: "#252629")
-        self.rePasswordTextField.font = NSFont.SFProTextRegular(14.0)
+        self.rePasswordTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.rePasswordTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
         
         self.rePasswordSecureTextField.textColor = NSColor(hex: "#252629")
-        self.rePasswordSecureTextField.font = NSFont.SFProTextRegular(14.0)
+        self.rePasswordSecureTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.rePasswordSecureTextField.border(NSColor(hex: "#FFFFFF"), 1, 0)
         
         self.rePasswordAlertLabel.textColor = NSColor(hex: "#F3465B")
-        self.rePasswordAlertLabel.font = NSFont.SFProTextRegular(12.0)
+        self.rePasswordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
     override func reloadData() {
@@ -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.SFProTextRegular(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(hex: "#94989C") ])
         
-        self.passwordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter new password", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(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(hex: "#94989C") ])
     
         
         //rePassword
-        self.rePasswordTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter the new password again", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(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(hex: "#94989C") ])
         
-        self.rePasswordSecureTextField.placeholderAttributedString = NSAttributedString(string: NSLocalizedString("Enter the new password again", comment: ""), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(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(hex: "#94989C") ])
     
     }
 }

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

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

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

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

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -88,7 +88,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
                 self.waterExportButton.backgroundColor(NSColor.clear)
                 self.waterExportButton.border(NSColor(hex: "#DFE1E5"), 0, 20)
 //                self.waterExportButton.contentTintColor = NSColor(hex: "#252629")
-                self.waterExportButton.font = NSFont.SFProTextRegular(12)
+                self.waterExportButton.font = NSFont.SFProTextRegularFont(12)
             }
         }
     }
@@ -113,17 +113,17 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
         self.collectionView.register(KMSubscribeWaterMarkCollectionItem.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMSubscribeWaterMarkCollectionItem"))
         
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextSemibold(20)
+        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.font = NSFont.SFProTextRegular(16)
+        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.subscribeLabel.font = NSFont.SFProTextRegular(16)
+        self.subscribeLabel.font = NSFont.SFProTextRegularFont(16)
         
         self.subscribeBox.moveCallback = { [unowned self] mouseEntered, mouseBox in
             if mouseEntered {
@@ -187,7 +187,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .left
         self.subtitleLabel.textColor = NSColor(hex: "#273C62")
-        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: NSLocalizedString(subtitleString, comment: ""), attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, NSAttributedString.Key.font : NSFont.SFProTextRegular(12)])
+        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: NSLocalizedString(subtitleString, comment: ""), attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12)])
     }
 
     override func reloadData() {
@@ -262,8 +262,8 @@ extension KMSubscribeWaterMarkView: NSCollectionViewDelegateFlowLayout {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.4
         paragraphStyle.alignment = .left
-        let size: NSSize = string.boundingRect(with: NSSize(width: 350, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextSemibold(14), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
-        let subtitleSize: NSSize = subtitleString.boundingRect(with: NSSize(width: 350, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(12), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
+        let size: NSSize = string.boundingRect(with: NSSize(width: 350, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextSemiboldFont(14), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
+        let subtitleSize: NSSize = subtitleString.boundingRect(with: NSSize(width: 350, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
         return NSSize(width: 394, height: max(44, size.height + subtitleSize.height + 4))
     }
 

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

@@ -36,7 +36,7 @@ class KMLightMemberAlertView: KMBaseXibView {
         super.updateUI()
         self.contentView.backgroundColor(NSColor(hex: "#FDC7C6"))
         
-        self.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.titleLabel.textColor = NSColor(hex: "#252629")
     }
     
@@ -60,7 +60,7 @@ class KMLightMemberAlertView: KMBaseXibView {
         let paragraphStyle = NSMutableParagraphStyle()
 //        paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .left
-        let size: NSSize = string.boundingRect(with: NSSize(width: 356, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegular(14), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
+        let size: NSSize = string.boundingRect(with: NSSize(width: 356, height: 100), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14), NSAttributedString.Key.paragraphStyle : paragraphStyle]).size
         return size.height + 32
     }
     

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

@@ -112,10 +112,10 @@ class KMVerificationCodeView: KMBaseXibView {
         
         self.backgroundColor(NSColor(hex: "#FFFFFF"))
         
-        self.titleLabel.font = NSFont.SFProTextSemibold(20.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(20.0)
         self.titleLabel.textColor = NSColor(hex: "#252629")
         
-        self.describeLabel.font = NSFont.SFProTextRegular(14.0)
+        self.describeLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.describeLabel.textColor = NSColor(hex: "#252629")
         
         self.timerTextView.delegate = self
@@ -128,7 +128,7 @@ class KMVerificationCodeView: KMBaseXibView {
             let textField = textFieldArray[i]
             if textField != nil {
                 textField!.textField.textColor = NSColor(hex: "#252629")
-                textField!.textField.font = NSFont.SFProTextSemibold(20.0)
+                textField!.textField.font = NSFont.SFProTextSemiboldFont(20.0)
                 textField?.maxLen = 1
                 textField?.model.isCanNull = true
                 textField?.textField.tag = i + 10
@@ -282,13 +282,13 @@ class KMVerificationCodeView: KMBaseXibView {
         let attributedString = NSMutableAttributedString.init(string: string)
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .left;
-        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0),
+        attributedString.addAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(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.SFProTextRegular(12.0),
+        attributedString.setAttributes([NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0),
                                         NSAttributedString.Key.foregroundColor : NSColor(hex: "#1770F4"),
                                         NSAttributedString.Key.underlineColor : NSColor.clear,
                                         NSAttributedString.Key.link : "timer://"],

PDF Office/PDF Master/Class/KMLightMember/Tools/Alert/KMPurchaseAlertView.swift

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

PDF Office/PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m

@@ -504,7 +504,7 @@ static KMPDFEditAppendWindow *windowController = nil;
     self.loading_backgroundView.hidden = YES;
     
     self.limitLable.stringValue = NSLocalizedString(@"Merge 2 files at a time", "");
-    self.limitLable.font = [NSFont SFProTextRegular:12];
+    self.limitLable.font = [NSFont SFProTextRegularFont:12];
     self.limitLable.textColor = [[NSColor alloc] initWithHex:@"#F3465B" alpha:1];
     
     self.limit = NO;

PDF Office/PDF Master/Class/PDFTools/Batch/KMBatchWindowController.swift

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

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

@@ -23,7 +23,7 @@ class KMBatchCollectionViewItem: NSCollectionViewItem {
         // Do view setup here.
         self.contentView.wantsLayer = true
         self.contentView.layer?.cornerRadius = 4
-        self.titleTextField.font = NSFont.SFProTextRegular(14.0)
+        self.titleTextField.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     func reloadData() {

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

@@ -35,7 +35,7 @@ class KMBatchBackgroundView: KMBatchSettingItemView {
         self.applyButton.layer?.cornerRadius = 4
         self.applyButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
         self.applyButton.stringValue = NSLocalizedString("Compress", comment: "")
-        self.applyButton.font = NSFont.SFProTextRegular(14.0)
+        self.applyButton.font = NSFont.SFProTextRegularFont(14.0)
         self.applyButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
     }
     

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

@@ -82,29 +82,29 @@ class KMBatchRemoveView: KMBatchSettingItemView {
         
         self.titleLabel.textColor = NSColor.init(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
-        self.titleLabel.font = NSFont.SFProTextRegular(16.0)
+        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.stringValue = NSLocalizedString("Compress", comment: "")
-        self.removeButton.font = NSFont.SFProTextRegular(14.0)
+        self.removeButton.font = NSFont.SFProTextRegularFont(14.0)
         self.removeButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
         
         self.securityButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.securityButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.securityButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.watermarkButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.watermarkButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.watermarkButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.backgroundButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.backgroundButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.backgroundButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.headerAndFoolterButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.headerAndFoolterButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.headerAndFoolterButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.batesNumberButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.batesNumberButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.batesNumberButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
     }
     

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

@@ -36,7 +36,7 @@ class KMBatchBatesNumberView: KMBatchSettingItemView {
         self.applyButton.layer?.cornerRadius = 4
         self.applyButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
         self.applyButton.stringValue = NSLocalizedString("Apply", comment: "")
-        self.applyButton.font = NSFont.SFProTextRegular(14.0)
+        self.applyButton.font = NSFont.SFProTextRegularFont(14.0)
         self.applyButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
     }
     

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

@@ -57,30 +57,30 @@ class KMBatchCompressView: KMBatchSettingItemView {
         
         self.titleLabel.textColor = NSColor.init(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
-        self.titleLabel.font = NSFont.SFProTextRegular(16.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(16.0)
         
         self.subTitleLabel.textColor = NSColor.init(hex: "#616469")
         self.subTitleLabel.stringValue = NSLocalizedString("Optimization Options", comment: "")
-        self.subTitleLabel.font = NSFont.SFProTextRegular(12.0)
+        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.stringValue = NSLocalizedString("Compress", comment: "")
-        self.compressButton.font = NSFont.SFProTextRegular(14.0)
+        self.compressButton.font = NSFont.SFProTextRegularFont(14.0)
         self.compressButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
         
         self.largeButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.largeButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.largeButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.standardButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.standardButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.standardButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.smallButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.smallButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.smallButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.minimumButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.minimumButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.minimumButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
 
     }
     

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

@@ -42,22 +42,22 @@ class KMBatchConvertPDFView: KMBatchSettingItemView {
         
         self.titleLabel.textColor = NSColor.init(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
-        self.titleLabel.font = NSFont.SFProTextRegular(16.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(16.0)
         
         self.formatLabel.textColor = NSColor.init(hex: "#616469")
         self.formatLabel.stringValue = NSLocalizedString("Format", comment: "")
-        self.formatLabel.font = NSFont.SFProTextRegular(12.0)
+        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.stringValue = NSLocalizedString("Convert", comment: "")
-        self.convertActionButton.font = NSFont.SFProTextRegular(14.0)
+        self.convertActionButton.font = NSFont.SFProTextRegularFont(14.0)
         self.convertActionButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
         
         self.convertTitleLabel.textColor = NSColor.init(hex: "#252629")
         self.convertTitleLabel.stringValue = NSLocalizedString("Word", comment: "")
-        self.convertTitleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.convertTitleLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     override func reloadData() {

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

@@ -32,13 +32,13 @@ class KMBatchConverPDFCSVView: KMBatchConvertPDFItemView {
 
         self.settingTitleLabel.textColor = NSColor.init(hex: "#616469")
         self.settingTitleLabel.stringValue = NSLocalizedString("Excel Worksheet Settings", comment: "")
-        self.settingTitleLabel.font = NSFont.SFProTextRegular(12.0)
+        self.settingTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.onlyTablesButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.onlyTablesButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.onlyTablesButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.tablesTypeLabel.textColor = NSColor.init(hex: "#252629")
-        self.tablesTypeLabel.font = NSFont.SFProTextRegular(14.0)
+        self.tablesTypeLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     override func reloadData() {

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

@@ -53,22 +53,22 @@ class KMBatchConverPDFExcelView: KMBatchConvertPDFItemView {
         
         self.settingLabel.textColor = NSColor.init(hex: "#616469")
         self.settingLabel.stringValue = NSLocalizedString("Excel Worksheet Settings", comment: "")
-        self.settingLabel.font = NSFont.SFProTextRegular(12.0)
+        self.settingLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.formatButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.formatButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.formatButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.onlyTablesButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.onlyTablesButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.onlyTablesButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.onlyTextButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.onlyTextButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.onlyTextButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.worksheetButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.worksheetButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.worksheetButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.tablesTypeLabel.textColor = NSColor.init(hex: "#252629")
-        self.tablesTypeLabel.font = NSFont.SFProTextRegular(14.0)
+        self.tablesTypeLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     override func reloadData() {

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

@@ -26,10 +26,10 @@ class KMBatchConverPDFImageView: KMBatchConvertPDFItemView {
         
         self.settingLabel.textColor = NSColor.init(hex: "#616469")
         self.settingLabel.stringValue = NSLocalizedString("Format", comment: "")
-        self.settingLabel.font = NSFont.SFProTextRegular(12.0)
+        self.settingLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.imageTypeLabel.textColor = NSColor.init(hex: "#252629")
-        self.imageTypeLabel.font = NSFont.SFProTextRegular(14.0)
+        self.imageTypeLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     override func reloadData() {

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

@@ -29,13 +29,13 @@ class KMBatchTextRecognitionView: KMBatchConvertPDFItemView {
         
         self.textRecognitionSettingLabel.textColor = NSColor.init(hex: "#616469")
         self.textRecognitionSettingLabel.stringValue = NSLocalizedString("Text Recognition Settings", comment: "")
-        self.textRecognitionSettingLabel.font = NSFont.SFProTextRegular(12.0)
+        self.textRecognitionSettingLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.recognizeTextButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.recognizeTextButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.recognizeTextButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.languageLabel.textColor = NSColor.init(hex: "#252629")
-        self.languageLabel.font = NSFont.SFProTextRegular(14.0)
+        self.languageLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     override func reloadData() {

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

@@ -36,13 +36,13 @@ class KMBatchConverPDFWordView: KMBatchConvertPDFItemView {
         
         self.settingLabel.textColor = NSColor.init(hex: "#616469")
         self.settingLabel.stringValue = NSLocalizedString("Layout Settings", comment: "")
-        self.settingLabel.font = NSFont.SFProTextRegular(12.0)
+        self.settingLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.retainFlowingTextButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.retainFlowingTextButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.retainFlowingTextButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.retainPageLayoutButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.retainPageLayoutButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.retainPageLayoutButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     override func reloadData() {

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

@@ -35,7 +35,7 @@ class KMBatchHeaderAndFooterView: KMBatchSettingItemView {
         self.applyButton.layer?.cornerRadius = 4
         self.applyButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
         self.applyButton.stringValue = NSLocalizedString("Apply", comment: "")
-        self.applyButton.font = NSFont.SFProTextRegular(14.0)
+        self.applyButton.font = NSFont.SFProTextRegularFont(14.0)
         self.applyButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
     }
     

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

@@ -52,16 +52,16 @@ class KMBatchSecurityView: KMBatchSettingItemView {
         self.openPasswordTextFieldContentView.border()
         self.openPasswordTextFieldContentView.backgroundColor(NSColor.init(hex: "#FFFFFF"))
         //
-        self.openPasswordTextField.placeholderAttributedString = NSAttributedString.init(string: "Open Password", attributes: [NSAttributedString.Key.font: NSFont.SFProTextRegular(14), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C")])
+        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.font = NSFont.SFProTextRegular(14.0)
+        self.openPasswordTextField.font = NSFont.SFProTextRegularFont(14.0)
         //
         self.permissionTextFieldContentView.border()
         self.permissionTextFieldContentView.backgroundColor(NSColor.init(hex: "#FFFFFF"))
         //
-        self.permissionTextfield.placeholderAttributedString = NSAttributedString.init(string: "Permission Password", attributes: [NSAttributedString.Key.font: NSFont.SFProTextRegular(14), NSAttributedString.Key.foregroundColor: NSColor(hex: "#94989C")])
+        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.font = NSFont.SFProTextRegular(14.0)
+        self.permissionTextfield.font = NSFont.SFProTextRegularFont(14.0)
         //
         self.documentPrintButton.title = NSLocalizedString("Restrict document printing", comment: "")
         self.documentPrintButton.imageName = "btn_checkbox_unsel_on"
@@ -77,26 +77,26 @@ class KMBatchSecurityView: KMBatchSettingItemView {
         
         self.titleLabel.textColor = NSColor.init(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
-        self.titleLabel.font = NSFont.SFProTextRegular(16.0)
+        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.stringValue = NSLocalizedString("Compress", comment: "")
-        self.encryptButton.font = NSFont.SFProTextRegular(14.0)
+        self.encryptButton.font = NSFont.SFProTextRegularFont(14.0)
         self.encryptButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
         
         self.openPasswordButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.openPasswordButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.openPasswordButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.permissionButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.permissionButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.permissionButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.documentPrintButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.documentPrintButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.documentPrintButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         
         self.contentCopyButton.titleLabel.textColor = NSColor.init(hex: "#252629")
-        self.contentCopyButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.contentCopyButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     override func reloadData() {

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

@@ -36,7 +36,7 @@ class KMBatchWatermarkView: KMBatchSettingItemView {
         self.applyButton.layer?.cornerRadius = 4
         self.applyButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
         self.applyButton.stringValue = NSLocalizedString("Apply", comment: "")
-        self.applyButton.font = NSFont.SFProTextRegular(14.0)
+        self.applyButton.font = NSFont.SFProTextRegularFont(14.0)
         self.applyButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
     }
     

PDF Office/PDF Master/Class/PDFTools/Compress/Controller/KMCompressWindowController.swift

@@ -124,11 +124,11 @@ class KMCompressWindowController: NSWindowController {
     
     private func initUIProperty() {
         self.titleLabel.textColor = NSColor.titleColor()
-        self.titleLabel.font = .SFProTextSemibold(16)
+        self.titleLabel.font = .SFProTextSemiboldFont(16)
         
         self.batchButton.setTitleColor(NSColor.buttonTitleColor())
         self.batchButton.layer?.borderColor = NSColor.buttonBorderColor().cgColor
-        self.batchButton.font = .SFProTextRegular(14)
+        self.batchButton.font = .SFProTextRegularFont(14)
     }
     
     @objc func radioButtonAction(_ sender: NSButton) {

PDF Office/PDF Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.swift

@@ -273,19 +273,19 @@ class KMConvertBaseWindowController: KMBaseWindowController {
     
     private func initUIProperty() {
         self.titleLabel.textColor = NSColor.titleColor()
-        self.titleLabel.font = .SFProTextSemibold(16)
+        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.perLabel.textColor = NSColor.titleColor()
-        self.perLabel.font = .SFProTextRegular(12)
+        self.perLabel.font = .SFProTextRegularFont(12)
         self.totalNumberLabel.textColor = NSColor.titleColor()
-        self.totalNumberLabel.font = .SFProTextRegular(12)
+        self.totalNumberLabel.font = .SFProTextRegularFont(12)
         
         self.batchButton.setTitleColor(NSColor.buttonTitleColor())
         self.batchButton.layer?.borderColor = NSColor.buttonBorderColor().cgColor
-        self.batchButton.font = .SFProTextRegular(14)
+        self.batchButton.font = .SFProTextRegularFont(14)
     }
     
     func initSettingView() -> KMConvertSettingView? {

PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertCSVSettingView.swift

@@ -33,7 +33,7 @@ class KMConvertCSVSettingView: KMConvertSettingView {
         super.initSubViews()
         
         self.oneFileForPageComboBox.title = NSLocalizedString("Excel Worksheet Settings", comment: "")
-        self.oneFileForPageComboBox.font = .SFProTextSemibold(12)
+        self.oneFileForPageComboBox.font = .SFProTextSemiboldFont(12)
         self.oneFileForPageComboBox.setTitleColor(NSColor(hex: "#616469"))
         
         self.onlyGetTableVC = KMDesignButton.init(withType: .CheckBox)

PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertExcelSettingView.swift

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

PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertImageSettingView.swift

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

PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertOCRSettingItemView.swift

@@ -54,7 +54,7 @@ class KMConvertOCRSettingItemView: KMConvertBaseView {
         
         self.titleLabel.stringValue = NSLocalizedString("Text Recognition Settings", comment: "")
         self.titleLabel.textColor = NSColor(hex: "#616469")
-        self.titleLabel.font = .SFProTextRegular(12)
+        self.titleLabel.font = .SFProTextRegularFont(12)
         
         self.checkBox.fillColor = .clear
         self._checkVC?.target = self

PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertPageRangeSettingItemView.swift

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

PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertSettingLimitTipView.swift

@@ -68,7 +68,7 @@ class KMConvertSettingLimitTipView: NSView {
         self._iconIv.image = NSImage(named: "KMImageNameTipNormal")
         
         self._textField.stringValue = NSLocalizedString("Convert the first 10 pages for free", comment: "")
-        self._textField.font = .SFProTextRegular(12)
+        self._textField.font = .SFProTextRegularFont(12)
         self._textField.textColor = KMAppearance.titleColor()
         self._textField.textColor = NSColor(hex: "#F3465B")
         

PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertWordSettingView.swift

@@ -60,7 +60,7 @@ class KMConvertWordSettingView: KMConvertSettingView {
         
         self.pageSettingTitleLabel.stringValue = NSLocalizedString("Layout Settings", comment: "")
         self.pageSettingTitleLabel.textColor = NSColor(hex: "#616469")
-        self.pageSettingTitleLabel.font = .SFProTextRegular(12)
+        self.pageSettingTitleLabel.font = .SFProTextRegularFont(12)
     }
     
     override func viewDidMoveToWindow() {

PDF Office/PDF Master/Class/PDFTools/ImageToPDF/KMImageToPDFWindowController.swift

@@ -60,7 +60,7 @@ class KMImageToPDFWindowController: NSWindowController {
         self.batchPrecessingView.inputType = self.inputType
         self.chooseView.delegate = self
         
-        self.titleLabel.font = NSFont.SFProTextSemibold(16.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(16.0)
         self.titleLabel.textColor = NSColor(hex: "#252629")
         
         self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in

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

@@ -32,18 +32,18 @@ class KMBatchSelectedFilesView: KMBaseXibView {
         self.registerForDraggedTypes([NSPasteboard.PasteboardType.string, NSPasteboard.PasteboardType.fileURL]) //支持拖拽
         
         self.titleLabel.textColor = NSColor.init(hex: "#616469")
-        self.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.titleLabel.stringValue = NSLocalizedString("Selected files", comment: "")
         
         self.subtitleLabel.textColor = NSColor.init(hex: "#94989C")
-        self.subtitleLabel.font = NSFont.SFProTextRegular(12.0)
+        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: "")
         
         let title = 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: "")
         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.SFProTextRegular(12)])
+        self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor(hex: "#94989C"), NSAttributedString.Key.font: NSFont.SFProTextRegularFont(12)])
         
         self.box.moveCallback = { [unowned self] mouseEntered, mouseBox in
             if mouseEntered {

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

@@ -35,7 +35,7 @@ class KMBatchProcessingColumnHeaderCell: NSTableHeaderCell {
         titleRect.origin.y += 8
         
         let attributes = [NSAttributedString.Key.foregroundColor: NSColor.init(hex: "#616469"),
-                          NSAttributedString.Key.font: NSFont.SFProTextSemibold(12.0)]
+                          NSAttributedString.Key.font: NSFont.SFProTextSemiboldFont(12.0)]
         
         
         let attributedString = NSAttributedString(string: self.attributedStringValue.string, attributes: attributes)

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

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

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

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

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

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

PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMImageToPDFChooseView/KMImageToPDFChooseView.swift

@@ -84,16 +84,16 @@ class KMImageToPDFChooseView: KMBaseXibView {
         self.wantsLayer = true
         self.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
         
-        self.titleLabel.font = NSFont.SFProTextSemibold(16.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(16.0)
         self.titleLabel.textColor = NSColor.init(hex: "#252629")
         
-        self.exportTitleLable.font = NSFont.SFProTextRegular(12.0)
+        self.exportTitleLable.font = NSFont.SFProTextRegularFont(12.0)
         self.exportTitleLable.textColor = NSColor.init(hex: "#616469")
         
-        self.OCRTilteLable.font = NSFont.SFProTextRegular(12.0)
+        self.OCRTilteLable.font = NSFont.SFProTextRegularFont(12.0)
         self.OCRTilteLable.textColor = NSColor.init(hex: "#616469")
         
-        self.exportSelectFileLabel.font = NSFont.SFProTextRegular(14.0)
+        self.exportSelectFileLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.exportSelectFileLabel.textColor = NSColor.init(hex: "#94989C")
         
         self.filePathContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
@@ -102,29 +102,29 @@ class KMImageToPDFChooseView: KMBaseXibView {
         self.fileImageContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
         self.fileImageContentView.border()
         
-        self.selectLanguageLabel.font = NSFont.SFProTextRegular(14.0)
+        self.selectLanguageLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.selectLanguageLabel.textColor = NSColor.init(hex: "#252629")
         
-        self.newPDFButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.newPDFButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.newPDFButton.titleLabel.textColor = NSColor.init(hex: "#252629")
         
-        self.mergePDFButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.mergePDFButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.mergePDFButton.titleLabel.textColor = NSColor.init(hex: "#252629")
         
-        self.insertPDFButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.insertPDFButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.insertPDFButton.titleLabel.textColor = NSColor.init(hex: "#252629")
         
-        self.needRecognitionButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.needRecognitionButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.needRecognitionButton.titleLabel.textColor = NSColor.init(hex: "#252629")
 
         
-        self.saveTXTButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.saveTXTButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.saveTXTButton.titleLabel.textColor = NSColor.init(hex: "#252629")
         
         self.exportPDFButton.wantsLayer = true
         self.exportPDFButton.layer?.cornerRadius = 4
         self.exportPDFButton.contentTintColor = NSColor.init(hex: "#FFFFFF")
-        self.exportPDFButton.font = NSFont.SFProTextRegular(14.0)
+        self.exportPDFButton.font = NSFont.SFProTextRegularFont(14.0)
         self.exportPDFButton.layer?.backgroundColor = NSColor(hex: "#BDDFFD").cgColor
     }
     

PDF Office/PDF Master/Class/PDFTools/PageEdit/Base/KMPageEditSettingBaseWindowController.swift

@@ -59,7 +59,7 @@ class KMPageEditSettingBaseWindowController: KMBaseWindowController {
         
         self.cancelButton.title = ""
         self.funcButton.title = ""
-        self.titleLabel.font = .SFProTextSemibold(16)
+        self.titleLabel.font = .SFProTextSemiboldFont(16)
         self.titleLabel.textColor = KMAppearance.titleColor()
         
         self.cancelVC_?.target = self

PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditInsertDirectionItemView.swift

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

PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditInsertPageSizeItemView.swift

@@ -138,7 +138,7 @@ class KMPageEditInsertPageSizeItemView: KMPageEditBaseItemView {
         self.customComboVC?.stringValue = KMPageEditTools.getAllPageSizeUnit().first!
         
         self.titleLabel.stringValue = NSLocalizedString("Page Size", comment: "")
-        self.titleLabel.font = .SFProTextSemibold(12)
+        self.titleLabel.font = .SFProTextSemiboldFont(12)
         self.titleLabel.textColor = NSColor(hex: "#616469")
         
         self.customSize = NSSize(width: 210, height: 297)

PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditSplitSettingView.swift

@@ -71,7 +71,7 @@ class KMPageEditSplitSettingView: KMPageEditSettingBaseView {
         
         self.typeLabel.stringValue = NSLocalizedString("Split Method", comment: "")
         self.typeLabel.textColor = KMAppearance.subtitleColor()
-        self.typeLabel.font = .SFProTextSemibold(12)
+        self.typeLabel.font = .SFProTextSemiboldFont(12)
         
         self.oneFileForOnePageOtherLabel.stringValue = NSLocalizedString("page(s)", comment: "")
         
@@ -135,7 +135,7 @@ class KMPageEditSplitSettingView: KMPageEditSettingBaseView {
         
         self.nameLabel.stringValue = NSLocalizedString("File Name", comment: "")
         self.nameLabel.textColor = KMAppearance.subtitleColor()
-        self.nameLabel.font = .SFProTextSemibold(12)
+        self.nameLabel.font = .SFProTextSemiboldFont(12)
         
         self.nameView.wantsLayer = true
         self.nameView.layer?.backgroundColor = KMAppearance.view_bg_dis_color().cgColor
@@ -143,7 +143,7 @@ class KMPageEditSplitSettingView: KMPageEditSettingBaseView {
         self.nameView.layer?.borderColor = KMAppearance.view_border_dis_color().cgColor
         self.nameView.layer?.cornerRadius = 4
         self.nameViewLabel.textColor = KMAppearance.titleColor()
-        self.nameViewLabel.font = .SFProTextRegular(14)
+        self.nameViewLabel.font = .SFProTextRegularFont(14)
         self.nameViewLabel.lineBreakMode = .byTruncatingTail
         
         self.prefixForOrigFileNameVC = KMDesignButton(withType: .CheckBox)

PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditThumbnailItem.swift

@@ -82,9 +82,9 @@ class KMPageEditThumbnailItem: NSCollectionViewItem {
         self.pageView.layer?.cornerRadius = 4
         self.pageView.layer?.masksToBounds = true
         
-        self.pageTextLabel.font = NSFont.SFProTextRegular(14)
+        self.pageTextLabel.font = NSFont.SFProTextRegularFont(14)
         self.pageTextLabel.textColor = NSColor.titleColor()
-        self.pageSizeTextLabel.font = NSFont.SFProTextRegular(14)
+        self.pageSizeTextLabel.font = NSFont.SFProTextRegularFont(14)
         self.pageSizeTextLabel.textColor = NSColor(hex: "#616469")
     }
     

PDF Office/PDF Master/Class/PDFTools/PageEdit/Window/KMPageEditInsertCustomPageWindowController.swift

@@ -67,7 +67,7 @@ class KMPageEditInsertCustomPageWindowController: KMBaseWindowController {
         super.initDefaultValue()
         
         self.titleLabel.stringValue = NSLocalizedString("Insert Custom Page", comment: "")
-        self.titleLabel.font = .SFProTextSemibold(16)
+        self.titleLabel.font = .SFProTextSemiboldFont(16)
         self.titleLabel.textColor = KMAppearance.titleColor()
         
         self.cancelVC?.target = self

PDF Office/PDF Master/Class/PDFTools/Print/KMPrintWindowController.swift

@@ -68,7 +68,7 @@ class KMPrintWindowController: NSWindowController, NetServiceBrowserDelegate {
         self.window?.contentView?.wantsLayer = true
         self.window?.contentView?.layer?.backgroundColor = NSColor.init(hex: "#FFFFFF").cgColor
         
-        self.titleLabel.font = NSFont.SFProTextSemibold(16.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(16.0)
         self.titleLabel.textColor = NSColor(hex: "#252629")
         self.titleLabel.stringValue = NSLocalizedString("Print", comment: "")
         

PDF Office/PDF Master/Class/PDFTools/Print/View/BottomView/KMPrintBottomView.swift

@@ -39,7 +39,7 @@ class KMPrintBottomView: KMBaseXibView {
         self.printerButton.layer?.borderColor = NSColor(hex: "#DFE1E5").cgColor
         self.printerButton.layer?.cornerRadius = 4
         self.printerButton.title = NSLocalizedString("Printer", comment: "")
-        self.printerButton.font = NSFont.SFProTextRegular(14)
+        self.printerButton.font = NSFont.SFProTextRegularFont(14)
         self.printerButton.contentTintColor = NSColor(hex: "#252629")
         
         self.cancelButton.wantsLayer = true
@@ -47,7 +47,7 @@ class KMPrintBottomView: KMBaseXibView {
         self.cancelButton.layer?.borderColor = NSColor(hex: "#DFE1E5").cgColor
         self.cancelButton.layer?.cornerRadius = 4
         self.cancelButton.title = NSLocalizedString("Cancel", comment: "")
-        self.cancelButton.font = NSFont.SFProTextRegular(14)
+        self.cancelButton.font = NSFont.SFProTextRegularFont(14)
         self.cancelButton.contentTintColor = NSColor(hex: "#252629")
         
         self.savePDFButton.wantsLayer = true
@@ -55,14 +55,14 @@ class KMPrintBottomView: KMBaseXibView {
         self.savePDFButton.layer?.borderColor = NSColor(hex: "#DFE1E5").cgColor
         self.savePDFButton.layer?.cornerRadius = 4
         self.savePDFButton.title = NSLocalizedString("Save as PDF", comment: "")
-        self.savePDFButton.font = NSFont.SFProTextRegular(14)
+        self.savePDFButton.font = NSFont.SFProTextRegularFont(14)
         self.savePDFButton.contentTintColor = NSColor(hex: "#252629")
         
         self.printButton.wantsLayer = true
         self.printButton.layer?.backgroundColor = NSColor(hex: "#1770F4").cgColor
         self.printButton.layer?.cornerRadius = 4
         self.printButton.title = NSLocalizedString("Printer", comment: "")
-        self.printButton.font = NSFont.SFProTextRegular(14)
+        self.printButton.font = NSFont.SFProTextRegularFont(14)
         self.printButton.contentTintColor = NSColor(hex: "#FFFFFF")
     }
     

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/KMPrintChooseView.swift

@@ -85,37 +85,37 @@ class KMPrintChooseView: KMBaseXibView {
         }
         
         self.printerLabel.stringValue = NSLocalizedString("Print", comment: "") + ":"
-        self.printerLabel.font = NSFont.SFProTextRegular(14.0)
+        self.printerLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.printerLabel.textColor = NSColor.init(hex: "#252629")
         
         self.pageRangeLabel.stringValue = NSLocalizedString("Print", comment: "") + ":"
-        self.pageRangeLabel.font = NSFont.SFProTextRegular(14.0)
+        self.pageRangeLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.pageRangeLabel.textColor = NSColor.init(hex: "#252629")
         
         self.pageNumberLabel.stringValue = NSLocalizedString("Print", comment: "") + ":"
-        self.pageNumberLabel.font = NSFont.SFProTextRegular(14.0)
+        self.pageNumberLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.pageNumberLabel.textColor = NSColor.init(hex: "#252629")
         
         self.printerSetLabel.stringValue = NSLocalizedString("Print Settings", comment: "") + ":"
-        self.printerSetLabel.font = NSFont.SFProTextRegular(12.0)
+        self.printerSetLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.printerSetLabel.textColor = NSColor.init(hex: "#616469")
         
         self.printContentLabel.stringValue = NSLocalizedString("Contents", comment: "") + ":"
-        self.printContentLabel.font = NSFont.SFProTextRegular(14.0)
+        self.printContentLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.printContentLabel.textColor = NSColor.init(hex: "#252629")
         
         self.printDirectionLabel.stringValue = NSLocalizedString("Direction", comment: "") + ":"
-        self.printDirectionLabel.font = NSFont.SFProTextRegular(14.0)
+        self.printDirectionLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.printDirectionLabel.textColor = NSColor.init(hex: "#252629")
         
         self.pageSetButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.pageSetButton.stringValue = NSLocalizedString("Page Settings", comment: "") + ":"
-        self.pageSetButton.font = NSFont.SFProTextRegular(14.0)
+        self.pageSetButton.font = NSFont.SFProTextRegularFont(14.0)
         self.pageSetButton.contentTintColor = NSColor.init(hex: "#252629")
         
         self.printerButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.printerButton.stringValue = NSLocalizedString("EPSON L4260 Series", comment: "") + ":"
-        self.printerButton.font = NSFont.SFProTextRegular(14.0)
+        self.printerButton.font = NSFont.SFProTextRegularFont(14.0)
         self.printerButton.textColor = NSColor.init(hex: "#252629")
         self.printerButton.mouseDownAction = {[unowned self] (button, itemString) in
             self.presenter.printerAction(itemString)
@@ -123,7 +123,7 @@ class KMPrintChooseView: KMBaseXibView {
         
         self.pageRangeButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.pageRangeButton.stringValue = NSLocalizedString("All pages", comment: "") + ":"
-        self.pageRangeButton.font = NSFont.SFProTextRegular(14.0)
+        self.pageRangeButton.font = NSFont.SFProTextRegularFont(14.0)
         self.pageRangeButton.textColor = NSColor.init(hex: "#252629")
         self.pageRangeButton.mouseDownAction = {[unowned self] (button, itemString) in
             self.presenter.pageRangeAction(itemString)
@@ -131,7 +131,7 @@ class KMPrintChooseView: KMBaseXibView {
         
         self.printDirectionButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.printDirectionButton.stringValue = NSLocalizedString("Portrait", comment: "") + ":"
-        self.printDirectionButton.font = NSFont.SFProTextRegular(14.0)
+        self.printDirectionButton.font = NSFont.SFProTextRegularFont(14.0)
         self.printDirectionButton.textColor = NSColor.init(hex: "#252629")
         self.printDirectionButton.mouseDownAction = {[unowned self] (button, itemString) in
             self.presenter.printDirectionAction(itemString)
@@ -139,7 +139,7 @@ class KMPrintChooseView: KMBaseXibView {
         
         self.printContentButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.printContentButton.stringValue = NSLocalizedString("Document and Markups", comment: "") + ":"
-        self.printContentButton.font = NSFont.SFProTextRegular(14.0)
+        self.printContentButton.font = NSFont.SFProTextRegularFont(14.0)
         self.printContentButton.textColor = NSColor.init(hex: "#252629")
         self.printContentButton.mouseDownAction = {[unowned self] (button, itemString) in
             self.presenter.printContentAction(itemString)
@@ -147,7 +147,7 @@ class KMPrintChooseView: KMBaseXibView {
         
         self.blackAndWhiteButton.title = NSLocalizedString("Black and white", comment: "")
         self.blackAndWhiteButton.imageName = "btn_checkbox_unsel_on"
-        self.blackAndWhiteButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.blackAndWhiteButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.blackAndWhiteButton.titleLabel.textColor = NSColor.init(hex: "#252629")
         self.blackAndWhiteButton.action = { [unowned self] (view, button) in
             self.presenter.blackAndWhiteAction(button)
@@ -155,7 +155,7 @@ class KMPrintChooseView: KMBaseXibView {
         
         self.reversePagesButton.title = NSLocalizedString("Reverse pages", comment: "")
         self.reversePagesButton.imageName = "btn_checkbox_unsel_on"
-        self.reversePagesButton.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.reversePagesButton.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.reversePagesButton.titleLabel.textColor = NSColor.init(hex: "#252629")
         self.reversePagesButton.action = { [unowned self] (view, button) in
             self.presenter.printReverseAction(button)

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/KMPrintChoosePageSizeView.swift

@@ -69,27 +69,27 @@ class KMPrintChoosePageSizeView: KMBaseXibView {
         
         self.titleLabel.stringValue = NSLocalizedString("Page Sizing & Handling", comment: "")
         self.titleLabel.textColor = NSColor(hex: "#616469")
-        self.titleLabel.font = NSFont.SFProTextRegular(12.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(12.0)
         
         self.sizeButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.sizeButton.stringValue = NSLocalizedString("Size", comment: "")
         self.sizeButton.contentTintColor = NSColor(hex: "#252629")
-        self.sizeButton.font = NSFont.SFProTextRegular(12.0)
+        self.sizeButton.font = NSFont.SFProTextRegularFont(12.0)
         
         self.posterButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.posterButton.stringValue = NSLocalizedString("Poster", comment: "")
         self.posterButton.contentTintColor = NSColor(hex: "#252629")
-        self.posterButton.font = NSFont.SFProTextRegular(12.0)
+        self.posterButton.font = NSFont.SFProTextRegularFont(12.0)
         
         self.multipageButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.multipageButton.stringValue = NSLocalizedString("Multiple", comment: "")
         self.multipageButton.contentTintColor = NSColor(hex: "#252629")
-        self.multipageButton.font = NSFont.SFProTextRegular(12.0)
+        self.multipageButton.font = NSFont.SFProTextRegularFont(12.0)
         
         self.pamphletButton.border(NSColor(hex: "#DFE1E5"), 1, 4)
         self.pamphletButton.stringValue = NSLocalizedString("Booklet", comment: "")
         self.pamphletButton.contentTintColor = NSColor(hex: "#252629")
-        self.pamphletButton.font = NSFont.SFProTextRegular(12.0)
+        self.pamphletButton.font = NSFont.SFProTextRegularFont(12.0)
         
         
     }

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/View/DealPaper/View/KMPrintHelpViewController.swift

@@ -25,7 +25,7 @@ Multiple prints 2 or more PDF pages per sheet.
 Booklet prints brochures and other publications that will be folded and stapled or bound together.
 """
         self.titleLabel.wantsLayer = true
-        self.titleLabel.font = NSFont.SFProTextRegular(12.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.titleLabel.textColor = NSColor(hex: "#FFFFFF")
         self.titleLabel.lineBreakMode = .byWordWrapping
         let paragraphStyle = NSMutableParagraphStyle()

PDF Office/PDF Master/Class/PDFTools/Print/View/Preview/KMPrintPreviewView.swift

@@ -50,7 +50,7 @@ class KMPrintPreviewView: KMBaseXibView {
         self.previewContentView.wantsLayer = true
         self.previewContentView.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
         
-        self.currentPageTextField.textField.font = NSFont.SFProTextRegular(12.0)
+        self.currentPageTextField.textField.font = NSFont.SFProTextRegularFont(12.0)
         self.currentPageTextField.textField.textColor = NSColor(hex: "#252629")
         self.currentPageTextField.textDidEndEditing = {[unowned self] (string) in
             self.presenter.toPage(index: UInt(string) ?? 0)
@@ -58,10 +58,10 @@ class KMPrintPreviewView: KMBaseXibView {
         
         self.partitionLabel.textColor = NSColor(hex: "#252629")
         
-        self.titleLabel.font = NSFont.SFProTextRegular(12.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.titleLabel.textColor = NSColor(hex: "#616469")
         
-        self.pageCountLabel.font = NSFont.SFProTextRegular(12.0)
+        self.pageCountLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.pageCountLabel.textColor = NSColor(hex: "#252629")
         
         self.previousButton.wantsLayer = true

PDF Office/PDF Master/Class/PDFTools/Secure/View/KMSecureEncryptSuccessTipView.swift

@@ -59,7 +59,7 @@ class KMSecureEncryptSuccessTipView: NSView {
         self.iconImageView.addSubview(self.iconSelectImageView)
         
         self.titleLabel.stringValue = NSLocalizedString("Set password successfully", comment: "")
-        self.titleLabel.font = NSFont.SFProTextRegular(14)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(14)
         self.titleLabel.textColor = NSColor.titleColor()
         self.closeButton.isBordered = false
         self.closeButton.image = NSImage(named: "KMImageNameWhiteClose")
@@ -74,7 +74,7 @@ class KMSecureEncryptSuccessTipView: NSView {
         let ps = NSMutableParagraphStyle()
         ps.lineSpacing = 7
         despLabel.attributedStringValue = NSAttributedString(string: despLabel.stringValue, attributes: [.foregroundColor : NSColor.despColor(),
-            .font : NSFont.SFProTextRegular(14),
+            .font : NSFont.SFProTextRegularFont(14),
             .paragraphStyle : ps
         ])
         
@@ -82,7 +82,7 @@ class KMSecureEncryptSuccessTipView: NSView {
         self.knowButtonVC?.button(type: .Ghost, size: .m)
         self.knowButtonVC?.target = self
         self.knowButtonVC?.action = #selector(knowButtonAction)
-        let size = self.knowButtonVC?.stringValue.boundingRect(with: NSMakeSize(1000, self.knowButtonSize.height), options: [.usesLineFragmentOrigin, .usesFontLeading], attributes: [.foregroundColor : NSColor.buttonTitleColor(), .font : NSFont.SFProTextRegular(14)]).size
+        let size = self.knowButtonVC?.stringValue.boundingRect(with: NSMakeSize(1000, self.knowButtonSize.height), options: [.usesLineFragmentOrigin, .usesFontLeading], attributes: [.foregroundColor : NSColor.buttonTitleColor(), .font : NSFont.SFProTextRegularFont(14)]).size
         if (size == nil || size!.width < 40) {
             self.knowButtonSize.width = 70
         } else {

PDF Office/PDF Master/Class/PDFTools/Secure/View/KMSecureLimitAlertView.swift

@@ -54,13 +54,13 @@ class KMSecureLimitAlertView: NSView {
         
         self.titleLabel.stringValue = NSLocalizedString("File Restricted", comment: "")
         self.titleLabel.textColor = NSColor.titleColor()
-        self.titleLabel.font = NSFont.SFProTextRegular(14)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(14)
         
         despLabel.stringValue = NSLocalizedString("The file is protected with a password. ", comment: "")
         let ps = NSMutableParagraphStyle()
         ps.lineSpacing = 7
         despLabel.attributedStringValue = NSAttributedString(string: despLabel.stringValue, attributes: [.foregroundColor : NSColor.despColor(),
-            .font : NSFont.SFProTextRegular(14),
+            .font : NSFont.SFProTextRegularFont(14),
             .paragraphStyle : ps
         ])
         
@@ -74,7 +74,7 @@ class KMSecureLimitAlertView: NSView {
         self.funcButtonVC?.action = #selector(funcButtonAction)
         self.funcButtonVC?.button(type: .Ghost, size: .m)
         
-        let size = self.funcButtonVC?.stringValue.boundingRect(with: NSMakeSize(1000, self.funcButtonSize.height), options: [.usesLineFragmentOrigin, .usesFontLeading], attributes: [.foregroundColor : NSColor.buttonTitleColor(), .font : NSFont.SFProTextRegular(14)]).size
+        let size = self.funcButtonVC?.stringValue.boundingRect(with: NSMakeSize(1000, self.funcButtonSize.height), options: [.usesLineFragmentOrigin, .usesFontLeading], attributes: [.foregroundColor : NSColor.buttonTitleColor(), .font : NSFont.SFProTextRegularFont(14)]).size
         if (size == nil || size!.width < 40) {
             self.funcButtonSize.width = 70
         } else {

PDF Office/PDF Master/Class/PDFTools/Secure/Window/KMPasswordInputWindow.swift

@@ -88,10 +88,10 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
 //                ps.lineBreakMode = .byTruncatingTail
 //                if (newValue == .open) {
 //                    despLabel!.stringValue = "\"\(fileName)\"\(NSLocalizedString("is protected, please enter a Document Open Password.", comment: ""))"
-//                    despLabel!.attributedStringValue = NSAttributedString(string: despLabel!.stringValue, attributes: [.foregroundColor : NSColor.titleColor(), .font : NSFont.SFProTextRegular(14), .paragraphStyle : ps])
+//                    despLabel!.attributedStringValue = NSAttributedString(string: despLabel!.stringValue, attributes: [.foregroundColor : NSColor.titleColor(), .font : NSFont.SFProTextRegularFont(14), .paragraphStyle : ps])
 //                } else {
                     despLabel!.stringValue = "\"\(fileName)\"\(NSLocalizedString("is protected, please enter the password to unlock it.", comment: ""))"
-                    despLabel!.attributedStringValue = NSAttributedString(string: despLabel!.stringValue, attributes: [.foregroundColor : NSColor.titleColor(), .font : NSFont.SFProTextRegular(14), .paragraphStyle : ps])
+                    despLabel!.attributedStringValue = NSAttributedString(string: despLabel!.stringValue, attributes: [.foregroundColor : NSColor.titleColor(), .font : NSFont.SFProTextRegularFont(14), .paragraphStyle : ps])
 //                }
             }
         }
@@ -116,21 +116,21 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
             
             titleLabel.stringValue = NSLocalizedString("Permission Password", comment: "")
             self.titleLabel.textColor = NSColor.titleColor()
-            titleLabel.font = NSFont.SFProTextRegular(16)
+            titleLabel.font = NSFont.SFProTextRegularFont(16)
             self.titleLabel.window?.appearance = NSAppearance(named: .aqua)
         }
         
         if despLabel != nil {
             despLabel.stringValue = NSLocalizedString("is protected, please enter the password to unlock it.", comment: "")
             self.despLabel.textColor = NSColor.titleColor()
-            despLabel.font = NSFont.SFProTextRegular(14)
+            despLabel.font = NSFont.SFProTextRegularFont(14)
             despLabel.isSelectable = false
             let ps = NSMutableParagraphStyle()
             ps.lineSpacing = 5
             despLabel.maximumNumberOfLines = 2
             despLabel.lineBreakMode = .byTruncatingTail
             ps.lineBreakMode = .byTruncatingTail
-            despLabel.attributedStringValue = NSAttributedString(string: despLabel.stringValue, attributes: [.foregroundColor : NSColor.titleColor(), .font : NSFont.SFProTextRegular(14), .paragraphStyle : ps])
+            despLabel.attributedStringValue = NSAttributedString(string: despLabel.stringValue, attributes: [.foregroundColor : NSColor.titleColor(), .font : NSFont.SFProTextRegularFont(14), .paragraphStyle : ps])
         }
         
         if (iconImageView != nil) {
@@ -210,12 +210,12 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
 //                    button?.title = NSLocalizedString("Cancel", comment: "")
                     button?.title = ""
 //                    button?.setTitleColor(NSColor.buttonTitleColor())
-//                    button?.font = NSFont.SFProTextRegular(14)
+//                    button?.font = NSFont.SFProTextRegularFont(14)
 //                    button?.action = #selector(cancelButtonAction)
                 } else {
 //                    button?.title = NSLocalizedString("Open", comment: "")
 //                    button?.attributedTitle = NSMutableAttributedString(string: button!.title, attributes: [.foregroundColor : NSColor.white])
-//                    button?.font = NSFont.SFProTextRegular(14)
+//                    button?.font = NSFont.SFProTextRegularFont(14)
 //                    button?.action = #selector(confirmButtonAction)
                     button?.title = ""
                 }

PDF Office/PDF Master/Class/PDFTools/Tools/KMImageTitleButton/KMImageTitleButton.swift

@@ -46,7 +46,7 @@ typealias KMImageTitleButtonAction = (_ view: KMImageTitleButton, _ button: NSBu
         }
     }
 
-    var font: NSFont = NSFont.SFProTextRegular(14) {
+    var font: NSFont = NSFont.SFProTextRegularFont(14) {
         didSet {
             self.reloadData()
         }

PDF Office/PDF Master/Class/PDFTools/Tools/KMTextFieldStepperView/KMTextFieldStepperView.swift

@@ -63,7 +63,7 @@ class KMTextFieldStepperView: KMBaseXibView, NSTextFieldDelegate {
         }
     }
     
-    var font: NSFont = NSFont.SFProTextRegular(14.0) {
+    var font: NSFont = NSFont.SFProTextRegularFont(14.0) {
         didSet {
             self.inputTextField.textField.font = font
         }

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/KMReadModelView.swift

@@ -188,20 +188,20 @@ class KMReadModelView: KMBaseXibView {
         zoomButton.view.frame = CGRect(x: 0, y: 0, width: 65, height: 24)
         zoomButton.selectItem(at: 0)
         zoomButton.delete = self
-        zoomButton.font = NSFont.SFProTextRegular(12.0)
-        zoomButton.font_hov = NSFont.SFProTextRegular(12.0)
-        zoomButton.font_focus = NSFont.SFProTextRegular(12.0)
-        zoomButton.font_disabled = NSFont.SFProTextRegular(12.0)
+        zoomButton.font = NSFont.SFProTextRegularFont(12.0)
+        zoomButton.font_hov = NSFont.SFProTextRegularFont(12.0)
+        zoomButton.font_focus = NSFont.SFProTextRegularFont(12.0)
+        zoomButton.font_disabled = NSFont.SFProTextRegularFont(12.0)
         zoomButton.borderWidth = 0
         zoomButton.updateUI()
         
         currentPageBackgroundView.border(NSColor(hex: "#DFE1E5"), 1, 4)
         currentPageTextField.textColor = NSColor(hex: "#252629")
-        currentPageTextField.font = NSFont.SFProTextRegular(12.0)
+        currentPageTextField.font = NSFont.SFProTextRegularFont(12.0)
         currentPageTextField.delegate = self
         
         totalLable.textColor = NSColor(hex: "#252629")
-        totalLable.font = NSFont.SFProTextRegular(12.0)
+        totalLable.font = NSFont.SFProTextRegularFont(12.0)
         
         
         contentBox.moveCallback = { [unowned self] (enter, box) in
@@ -273,7 +273,7 @@ extension KMReadModelView {
     
     func fetchCurrentPageIndexWidth(string: NSString) -> CGFloat {
         var width = 28.0
-        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0)]
+        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0)]
         width += string.boundingRect(with: CGSize(width: 100, height: 24), attributes: attributes).size.width
         width = max(width, 48)
         return width
@@ -281,7 +281,7 @@ extension KMReadModelView {
     
     func fetchTotalPageIndexWidth(string: NSString) -> CGFloat {
         var width = 0.0
-        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0)]
+        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0)]
         width += string.boundingRect(with: CGSize(width: 100, height: 24), attributes: attributes).size.width
         width = max(width, 30)
         return width
@@ -289,7 +289,7 @@ extension KMReadModelView {
     
     func fetchScaleWidth(string: NSString) -> CGFloat {
         var width = 40.0
-        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0)]
+        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12.0)]
         width += string.boundingRect(with: CGSize(width: 100, height: 24), attributes: attributes).size.width
         width = max(width, 80)
         return width

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationTool/KMBOTAAnnotationTool.swift

@@ -76,7 +76,7 @@ class KMBOTAAnnotationTool: NSObject {
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .left
         let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle,
-                          NSAttributedString.Key.font : NSFont.SFProTextRegular(14.0)]
+                          NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0)]
         return attributes
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationView/Views/KMAnnotationOutlineCellView.swift

@@ -66,7 +66,7 @@ class KMAnnotationOutlineCellView: NSTableCellView {
     }
     
     func setup() {
-        self.titleLabel.font = NSFont.SFProTextRegular(11.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(11.0)
         self.titleLabel.textColor = NSColor(hex: "#94989C")
         
 //        self.contentLabel.cell?.lineBreakMode = .byCharWrapping
@@ -75,7 +75,7 @@ class KMAnnotationOutlineCellView: NSTableCellView {
 //        self.contentLabel.truncatesLastVisibleLine = true
         self.contentLabel.maximumNumberOfLines = 0
         self.contentLabel.textColor = NSColor(hex: "#252629")
-        self.contentLabel.font = NSFont.SFProTextRegular(14)
+        self.contentLabel.font = NSFont.SFProTextRegularFont(14)
         
         self.noteLabel.lineBreakMode = .byCharWrapping
         self.noteLabel.maximumNumberOfLines = 0
@@ -87,7 +87,7 @@ class KMAnnotationOutlineCellView: NSTableCellView {
         self.noteContentView.layer?.masksToBounds = true
         
         self.noteLabel.textColor = NSColor(hex: "#616469")
-        self.noteLabel.font = NSFont.SFProTextRegular(14)
+        self.noteLabel.font = NSFont.SFProTextRegularFont(14)
     }
     
     override func layout() {

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationView/Views/KMAnnotationOutlineSectionView.swift

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

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.swift

@@ -78,16 +78,16 @@ class KMAnnotationViewController: KMSideViewController {
     }
     
     func updateUI() {
-        self.markupTitleLabel.font = NSFont.SFProTextSemibold(14.0)
+        self.markupTitleLabel.font = NSFont.SFProTextSemiboldFont(14.0)
         self.markupTitleLabel.textColor = NSColor(hex: "#252629")
         
-        self.bigTipLabel.font = NSFont.SFProTextRegular(14.0)
+        self.bigTipLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.bigTipLabel.textColor = NSColor(hex: "#616469")
         
         if self.annotationShowState == .none {
             
         } else {
-            self.bigTipLabel.font = NSFont.SFProTextRegular(12.0)
+            self.bigTipLabel.font = NSFont.SFProTextRegularFont(12.0)
             self.bigTipLabel.textColor = NSColor(hex: "#94989C")
         }
     }
@@ -106,7 +106,7 @@ class KMAnnotationViewController: KMSideViewController {
             let paragraphStyle = NSMutableParagraphStyle()
             paragraphStyle.lineHeightMultiple = 1.32
             paragraphStyle.alignment = .center
-            self.tipLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor(hex: "#94989C"), NSAttributedString.Key.font: NSFont.SFProTextRegular(12)])
+            self.tipLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor(hex: "#94989C"), NSAttributedString.Key.font: NSFont.SFProTextRegularFont(12)])
         } else {
             self.bigTipLabel.stringValue = NSLocalizedString("The Annotations are hidden", comment: "")
             self.tipLabel.stringValue = ""

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMNoteOutlineFilterViewController.m

@@ -74,13 +74,13 @@ NSString *KMNoteOutlineFilterSelectArray_Color = @"KMNoteOutlineFilterSelectArra
     self.view.layer.borderWidth = 0.0f;
 
     self.typeLabel.textColor = [[NSColor alloc] initWithHex:@"#616469" alpha:1];
-    self.typeLabel.font = [NSFont SFProTextRegular: 12.0];
+    self.typeLabel.font = [NSFont SFProTextRegularFont: 12.0];
     
     self.colorLabel.textColor = [[NSColor alloc] initWithHex:@"#616469" alpha:1];
-    self.colorLabel.font = [NSFont SFProTextRegular: 12.0];
+    self.colorLabel.font = [NSFont SFProTextRegularFont: 12.0];
     
     self.authorLabel.textColor = [[NSColor alloc] initWithHex:@"#616469" alpha:1];
-    self.authorLabel.font = [NSFont SFProTextRegular: 12.0];
+    self.authorLabel.font = [NSFont SFProTextRegularFont: 12.0];
     
     
     self.clearButton = [[KMDesignButton alloc] initWithType: DesignButtonTypeText];

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMScreenViewController/ScreenCollectionView/KMAnnotationScreenCollectionView.swift

@@ -147,7 +147,7 @@ class KMAnnotationScreenCollectionView: KMBaseXibView {
                     let paragraphStyle = NSMutableParagraphStyle()
                     paragraphStyle.alignment = .center;
                     let size: CGSize = NSString(string: author).boundingRect(with: CGSize(width: 200, height: 32), attributes:
-                                                                                [NSAttributedString.Key.font: NSFont.SFProTextRegular(12.0),
+                                                                                [NSAttributedString.Key.font: NSFont.SFProTextRegularFont(12.0),
                                                                                  NSAttributedString.Key.foregroundColor: NSColor(hex: "#252629"),
                                                                                  NSAttributedString.Key.paragraphStyle: paragraphStyle]).size
                     authorItem.width = max(size.width + 16, 32)

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMScreenViewController/ScreenCollectionView/View/KMAnnotationScreenAuthorViewItem.swift

@@ -45,7 +45,7 @@ class KMAnnotationScreenAuthorViewItem: NSCollectionViewItem {
 //        authorButton?.action = #selector(authorButtonAction)
 //        authorButton?.fillColor = NSColor.clear
 //        authorButton?.updateUI()
-        self.titleLabel?.font = NSFont.SFProTextRegular(12.0)
+        self.titleLabel?.font = NSFont.SFProTextRegularFont(12.0)
         self.titleLabel?.textColor = NSColor(hex: "#252629")
         
         self.box.moveCallback = { [unowned self] (mouseEntered, mouseBox) in

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMScreenViewController/ScreenCollectionView/View/KMAnnotationScreenHeadView.swift

@@ -30,7 +30,7 @@ class KMAnnotationScreenHeadView: NSView {
     }
     
     func updateUI() {
-        titleLabel.font = NSFont.SFProTextSemibold(12.0)
+        titleLabel.font = NSFont.SFProTextSemiboldFont(12.0)
         titleLabel.textColor = NSColor(hex: "#616469")
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMAnnotationTableCellView.swift

@@ -41,7 +41,7 @@ class KMAnnotationHeaderCellView: NSTableCellView {
         self.line2.backgroundColor(NSColor(hex: "#EDEEF0"))
         
         self.backgroundColor(NSColor(hex: "#FFFFFF"))
-        self.currentPageLabel.font = NSFont.SFProTextRegular(14.0)
+        self.currentPageLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.currentPageLabel.textColor = NSColor(hex: "#252629")
         
     }
@@ -120,10 +120,10 @@ class KMAnnotationTableCellView: NSTableCellView {
         self.contentBGView.layer?.masksToBounds = true
         
         self.contentLabel.textColor = NSColor(hex: "#252629")
-        self.contentLabel.font = NSFont.SFProTextRegular(14)
+        self.contentLabel.font = NSFont.SFProTextRegularFont(14)
         
         self.contentInfoLabel.textColor = NSColor(hex: "#616469")
-        self.contentInfoLabel.font = NSFont.SFProTextRegular(14)
+        self.contentInfoLabel.font = NSFont.SFProTextRegularFont(14)
     }
     
     func updateLanguage() {

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteFilterCollevtionViewItem.m

@@ -82,7 +82,7 @@
     NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
     [dictionary setObject:style forKey:NSParagraphStyleAttributeName];
     [dictionary setObject:self.textColor forKey:NSForegroundColorAttributeName];
-    [dictionary setObject: [NSFont SFProTextRegular: 12.0]   forKey:NSFontAttributeName];
+    [dictionary setObject: [NSFont SFProTextRegularFont: 12.0]   forKey:NSFontAttributeName];
     NSSize size = [self.stringValue boundingRectWithSize:CGSizeMake(MAXFLOAT, MAXFLOAT)
                                         options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading
                                      attributes:dictionary].size;

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/BookMarks/KMBookMarkViewController.swift

@@ -67,13 +67,13 @@ class KMBookMarkViewController: NSViewController, NSTextFieldDelegate {
     }
     
     func refreshUI() {
-        self.titleTextField.font = NSFont.SFProTextSemibold(14.0)
+        self.titleTextField.font = NSFont.SFProTextSemiboldFont(14.0)
         self.titleTextField.textColor = NSColor(hex: "#252629")
         self.titleTextField.stringValue = NSLocalizedString("Bookmarks", comment: "")
         self.addBookButton.toolTip = NSLocalizedString("Add Bookmark", comment: "")
         
         
-        self.bigTipLabel.font = NSFont.SFProTextRegular(14.0)
+        self.bigTipLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.bigTipLabel.textColor = NSColor(hex: "#616469")
         self.bigTipLabel.stringValue = NSLocalizedString("No Bookmarks", comment: "")
         

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/BookMarks/View/KMBookCellView.swift

@@ -13,7 +13,7 @@ class KMBookCellView: NSTableCellView {
     override func awakeFromNib() {
         super.awakeFromNib()
         self.bookTitle.textColor = NSColor(hex: "#252629")
-        self.bookTitle.font = NSFont.SFProTextRegular(14.0)
+        self.bookTitle.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     override func draw(_ dirtyRect: NSRect) {

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Outline/KMOutlineViewController.swift

@@ -74,9 +74,9 @@ class KMOutlineViewController: NSViewController {
         self.topSepline.layer?.backgroundColor = NSColor(red: 0, green: 0, blue: 0, alpha: 0.1).cgColor
         
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextSemibold(14.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(14.0)
         
-        self.bigTipLabel.font = NSFont.SFProTextRegular(14.0)
+        self.bigTipLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.bigTipLabel.textColor = NSColor(hex: "#616469")
         self.bigTipLabel.stringValue = NSLocalizedString("No Outlines", comment: "")
         

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Outline/OutlineView/KMBOTAOutlineView.swift

@@ -212,7 +212,7 @@ extension KMBOTAOutlineView : NSOutlineViewDataSource,NSOutlineViewDelegate {
             paragraphStyle.lineHeightMultiple = 1.32
             paragraphStyle.alignment = .left
             let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle,
-                              NSAttributedString.Key.font : NSFont.SFProTextRegular(14.0)]
+                              NSAttributedString.Key.font : NSFont.SFProTextRegularFont(14.0)]
             let size = string.boundingRect(with: CGSizeMake(outlineView.frame.size.width - 30, 200), options: NSString.DrawingOptions(rawValue: 3), attributes: attributes)
             return max(40, size.height + 16)
         }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Outline/OutlineView/View/KMBOTAOutlineCellView.swift

@@ -75,7 +75,7 @@ class KMBOTAOutlineCellView: NSTableCellView {
     
     func updateUI() {
         self.titleLabel.textColor = NSColor(hex: "#252629")
-        self.titleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.titleLabel.font = NSFont.SFProTextRegularFont(14.0)
     }
     
     func updateLanguage() {

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Search/KMSearchViewController.swift

@@ -92,10 +92,10 @@ class KMSearchViewController: NSViewController {
         //空状态
         self.emptyView.isHidden = true
         self.searResultLabel.stringValue = NSLocalizedString("No Search Results", comment: "")
-        self.searResultLabel.font = NSFont.SFProTextRegular(14.0)
+        self.searResultLabel.font = NSFont.SFProTextRegularFont(14.0)
         self.searResultLabel.textColor = NSColor(hex: "#616469")
         
-        self.tipTitleLabel.font = NSFont.SFProTextRegular(12.0)
+        self.tipTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.tipTitleLabel.textColor = NSColor(hex: "#94989C")
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
@@ -110,7 +110,7 @@ class KMSearchViewController: NSViewController {
         self.searchTextField.delegate = self
         self.searchTextField.border(NSColor(hex: "#FFFFFF"), 1, 4)
         self.searchTextField.textColor = NSColor(hex: "#252629")
-        self.searchTextField.font = NSFont.SFProTextRegular(14.0)
+        self.searchTextField.font = NSFont.SFProTextRegularFont(14.0)
         let search = UserDefaults.standard.object(forKey: "CPDFOfficeSearchIgnoreCaseKey")
         if search == nil {
             self.isCase = true
@@ -120,23 +120,23 @@ class KMSearchViewController: NSViewController {
         self.previousCase = self.isCase
         
         self.findTipTextField.stringValue = NSLocalizedString("Search", comment: "")
-        self.findTipTextField.font = NSFont.SFProTextSemibold(14.0)
+        self.findTipTextField.font = NSFont.SFProTextSemiboldFont(14.0)
         self.findTipTextField.textColor = NSColor(hex: "#252629")
         
         self.doneButton.isHidden = true
         self.doneButton.title = NSLocalizedString("Done", comment: "")
         self.doneButton.backgroundColor(NSColor(hex: "#1770F4"))
-        self.doneButton.font = NSFont.SFProTextRegular(12.0)
+        self.doneButton.font = NSFont.SFProTextRegularFont(12.0)
         self.doneButton.contentTintColor = NSColor(hex: "#FFFFFF")
         self.doneButton.border(NSColor(hex: "#1770F4"), 0, 4)
         
         //显示
         self.allTipTextField.stringValue = NSLocalizedString("All", comment: "")
-        self.allTipTextField.font = NSFont.SFProTextSemibold(11.0)
+        self.allTipTextField.font = NSFont.SFProTextSemiboldFont(11.0)
         self.allTipTextField.textColor = NSColor(hex: "#252629")
         
         self.resultTextField.stringValue = NSLocalizedString("Results", comment: "") + ":"
-        self.resultTextField.font = NSFont.SFProTextSemibold(11.0)
+        self.resultTextField.font = NSFont.SFProTextSemiboldFont(11.0)
         self.resultTextField.textColor = NSColor(hex: "#94989C")
         
         self.outlineView.allowsMultipleSelection = true
@@ -164,7 +164,7 @@ class KMSearchViewController: NSViewController {
            }
            searchFieldMenu.addItem(NSMenuItem.separator())
            searchFieldMenu.addItem(withTitle: NSLocalizedString("Clear Search History", comment: ""), action: #selector(clearSearchHistoryAction), target: self)
-           self.searchFieldMenu.font = NSFont.SFProTextRegular(13.0)
+           self.searchFieldMenu.font = NSFont.SFProTextRegularFont(13.0)
        }
        (self.searchTextField.cell! as! NSSearchFieldCell).searchMenuTemplate = searchFieldMenu
         
@@ -492,7 +492,7 @@ extension KMSearchViewController : NSOutlineViewDataSource,NSOutlineViewDelegate
             paragraphStyle.lineBreakMode = .byCharWrapping
             paragraphStyle.lineHeightMultiple = 1.32
             
-            let estimatedFrame = NSString(string: text).boundingRect(with: size, options: options, attributes: [NSAttributedString.Key.font: NSFont.SFProTextRegular(14.0),
+            let estimatedFrame = NSString(string: text).boundingRect(with: size, options: options, attributes: [NSAttributedString.Key.font: NSFont.SFProTextRegularFont(14.0),
                                                                                                                 NSAttributedString.Key.paragraphStyle: paragraphStyle], context: nil)
             
             return estimatedFrame.size.height + 16

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Search/View/KMSearchCellView.swift

@@ -50,10 +50,10 @@ class KMSearchCellView: NSTableCellView {
     }
     
     func setup() {
-        self.contextTextField.font = NSFont.SFProTextRegular(14.0)
+        self.contextTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.contextTextField.textColor = NSColor(hex: "#252629")
         
-        self.pageIndexTextField.font = NSFont.SFProTextRegular(14.0)
+        self.pageIndexTextField.font = NSFont.SFProTextRegularFont(14.0)
         self.pageIndexTextField.textColor = NSColor(hex: "#94989C")
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMPDFThumbnailItem.swift

@@ -39,7 +39,7 @@ class KMPDFThumbnailItem: NSCollectionViewItem {
         pageTextLabel.isBordered = false
         pageTextLabel.isSelectable = false
         pageTextLabel.drawsBackground = false
-        pageTextLabel.font = NSFont.SFProTextRegular(14)
+        pageTextLabel.font = NSFont.SFProTextRegularFont(14)
         pageTextLabel.textColor = NSColor(hex: "#252629")
         return pageTextLabel
     }()
@@ -49,7 +49,7 @@ class KMPDFThumbnailItem: NSCollectionViewItem {
         pageSizeTextLabel.isEditable = false
         pageSizeTextLabel.isBordered = false
         pageSizeTextLabel.drawsBackground = false
-        pageSizeTextLabel.font = NSFont.SFProTextRegular(14)
+        pageSizeTextLabel.font = NSFont.SFProTextRegularFont(14)
         pageSizeTextLabel.textColor = NSColor(hex: "#252629")
         return pageSizeTextLabel
     }()

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift

@@ -65,7 +65,7 @@ class KMThumbnailViewController: KMBaseViewController {
         self.headerView.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
         
         self.titleLabel.stringValue = NSLocalizedString("Thumbnails", comment: "")
-        self.titleLabel.font = NSFont.SFProTextSemibold(14.0)
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(14.0)
         self.titleLabel.textColor = NSColor(hex: "#252629")
         
         if self.listView.document != nil {