【2025】【Edit】编辑模块代码规范整理

PDF Office/PDF Master/Class/PDFTools/Measure/Side/KMMeasureSideVC.xib

@@ -826,7 +826,7 @@
                 <rect key="frame" x="-100" y="-100" width="303" height="15"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
-            <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.94047619047619047" horizontal="NO" id="GYX-OK-zPd">
+            <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="GYX-OK-zPd">
                 <rect key="frame" x="466" y="0.0" width="15" height="661"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/CipherTextView/CipherTextView.xib

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="CipherTextView" customModule="PDF_Office" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="CipherTextView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="300" height="400"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/Category/KMImageOptimization.swift

@@ -106,20 +106,20 @@ class KMImageOptimization: NSObject {
     
     static func resizeImage(_ image: NSImage, toSize newSize: NSSize) -> Data? {
         let resizedImage = NSImage(size: newSize)
-
+        
         resizedImage.lockFocus()
         NSGraphicsContext.current?.imageInterpolation = .high
-
+        
         image.draw(in: NSRect(x: 0, y: 0, width: newSize.width, height: newSize.height), from: NSRect.zero, operation: .copy, fraction: 1.0)
-
+        
         resizedImage.unlockFocus()
-
+        
         guard let imageData = resizedImage.tiffRepresentation,
               let bitmapImage = NSBitmapImageRep(data: imageData),
               let compressedData = bitmapImage.representation(using: .png, properties: [:]) else {
             return nil
         }
-
+        
         return compressedData
     }
     
@@ -134,29 +134,16 @@ class KMImageOptimization: NSObject {
             FileManager.default.createFile(atPath: string as String, contents: nil)
         }
         
-        // 示例用法
         if let compressedData = KMImageOptimization.compressImageLosslessly(image: image, targetSize: targetSize, maxSizeInBytes: maxSizeInBytes, targetCompression: targetCompression) {
             let saveURL = URL(fileURLWithPath: string as String)//URL(fileURLWithPath: "/path/to/save/compressed_image.png")
             do {
                 try compressedData.write(to: saveURL)
-                // 图像已成功保存在指定路径中
                 KMPrint("保存图像成功：\(string)")
             } catch {
                 KMPrint("保存图像失败：\(error)")
             }
         }
         
-//        // 示例用法
-//        if let compressedData = KMImageOptimization.resizeImage(image, toSize: targetSize) {
-//            let saveURL = URL(fileURLWithPath: string as String)//URL(fileURLWithPath: "/path/to/save/compressed_image.png")
-//            do {
-//                try compressedData.write(to: saveURL)
-//                // 图像已成功保存在指定路径中
-//                print("保存图像成功：\(string)")
-//            } catch {
-//                print("保存图像失败：\(error)")
-//            }
-//        }
         return string as String
     }
 }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift

@@ -67,7 +67,7 @@ class KMEditImagePropertyViewController: NSViewController {
     @IBOutlet weak var cancelBox: NSBox!
     @IBOutlet weak var replaceBox: NSBox!
     @IBOutlet weak var exportBox: NSBox!
-
+    
     @IBOutlet weak var opacityBoxHeight: NSLayoutConstraint!
     @IBOutlet weak var buttonBoxHeight: NSLayoutConstraint!
     @IBOutlet weak var buttonBox: NSBox!
@@ -118,7 +118,7 @@ class KMEditImagePropertyViewController: NSViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-    
+        
         self.setup()
         self.initData()
         self.updateLanguage()
@@ -137,7 +137,6 @@ class KMEditImagePropertyViewController: NSViewController {
         self.titleLabel.textColor = KMAppearance.Layout.h0Color()
         
         self.opacityTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
-//        self.opacityTitleLabel.textColor = KMAppearance.Layout.h0Color()
         
         self.whTitleLabel.font = NSFont.SFProTextRegularFont(12)
         self.whTitleLabel.stringValue = NSLocalizedString("Size", comment: "")
@@ -158,8 +157,6 @@ class KMEditImagePropertyViewController: NSViewController {
         self.wTextFieldItemView.rightView = wRightView
         var formatter = NumberFormatter()
         formatter.numberStyle = .decimal
-//        formatter.maximum = NSNumber(value: 999)
-//        formatter.minimum = NSNumber(value: 1)
         self.wTextFieldItemView.textFiled.formatter = formatter
         
         self.hTextFieldItemView.backgroundView.wantsLayer = true
@@ -201,7 +198,6 @@ class KMEditImagePropertyViewController: NSViewController {
         whVC?.cornerRadius_hov = 4
         whVC?.cornerRadius_disabled = 4
         self.whVC?.toolTip = NSLocalizedString("Keep Proportions", comment: "")
-//        self.whVC?.state = self._getKeepProportionsButtonState() ? .Act : .Norm
         let whState: KMDesignTokenState = self._getKeepProportionsButtonState() ? .Act : .Norm
         self.whVC?.state = .Norm
         self._setWHButtonState(whState)
@@ -220,7 +216,7 @@ class KMEditImagePropertyViewController: NSViewController {
         self.leftRotateVC?.action = #selector(leftRotationImageAction)
         self.leftRotateVC?.image = NSImage(named: "KMImageNameEditPDFRotationLeft")!
         self.leftRotateVC?.pagination()
-      
+        
         
         self.rightRotateVC = KMDesignButton(withType: .Image)
         self.rightRotateBox.contentView = self.rightRotateVC?.view
@@ -286,14 +282,6 @@ class KMEditImagePropertyViewController: NSViewController {
         cropVC?.action = #selector(cutImageAction)
         cropVC?.button(type: .Sec, size: .m)
         cropVC?.stringValue = NSLocalizedString("Crop", comment: "")
-//        cropVC?.borderColor = KMAppearance.Interactive.s0Color()
-//        cropVC?.background = KMAppearance.Layout.l1Color()
-//        cropVC?.background_hov = KMAppearance.Layout.l1Color()
-//        cropVC?.background_focus = KMAppearance.Layout.l1Color()
-//        cropVC?.textColor = KMAppearance.Layout.h1Color()
-//        cropVC?.textColor_hov = KMAppearance.Layout.h1Color()
-//        cropVC?.textColor_focus = KMAppearance.Layout.h1Color()
-//        cropVC?.updateUI()
         cropVC?.borderColor = KMAppearance.Interactive.s0Color()
         cropVC?.borderColor_hov = KMAppearance.Interactive.s0Color()
         cropVC?.borderColor_disabled = KMAppearance.Interactive.s0Color()
@@ -415,7 +403,6 @@ class KMEditImagePropertyViewController: NSViewController {
             self.alignmentView.alignmentLabel.textColor = NSColor(hex: "#C8C9CC")
             
             whVC?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-//            whVC?.background_focus = KMAppearance.Layout.l1Color()
             whVC?.background_disabled = KMAppearance.buttonDisabledColor()
             
             leftRotateVC?.borderColor = KMAppearance.Interactive.s0Color()
@@ -427,16 +414,6 @@ class KMEditImagePropertyViewController: NSViewController {
             leftRotateVC?.textColor_focus = KMAppearance.Layout.h1Color()
             leftRotateVC?.borderColor_hov = KMAppearance.Interactive.s0Color()
             leftRotateVC?.background_disabled = NSColor(white: 96/255.0, alpha: 1.0)
-//            cropVC?.borderColor = KMAppearance.Interactive.s0Color()
-//            cropVC?.borderColor_hov = KMAppearance.Interactive.s0Color()
-//            leftRotateVC?.borderColor_disabled = KMAppearance.Interactive.s0Color()
-//            leftRotateVC?.background = KMAppearance.Layout.l1Color()
-//            leftRotateVC?.background_hov = KMAppearance.Layout.l1Color()
-//            leftRotateVC?.background_focus = KMAppearance.Layout.l1Color()
-//            leftRotateVC?.background_disabled = KMAppearance.Layout.l1Color()
-//            cropVC?.textColor = KMAppearance.Layout.h1Color()
-//            cropVC?.textColor_hov = KMAppearance.Layout.h1Color()
-//            cropVC?.textColor_focus = KMAppearance.Layout.h1Color()
             
             leftRotateVC?.updateUI()
             
@@ -481,7 +458,6 @@ class KMEditImagePropertyViewController: NSViewController {
             
             self.rotateTextFieldItemView.fillColor = KMAppearance.Layout.w15Color()
             self.rotateTextFieldItemView.textF?.backgroundView.layer?.backgroundColor = KMAppearance.Layout.w15Color().cgColor
-//            self.rotateTextFieldItemView.updateUI(state: self.rotateTextFieldItemView.state)
             
             if self.rotateTextFieldItemView.state == .Focus {
                 let borderColor = NSColor(hex: "68ACF8")
@@ -518,7 +494,6 @@ class KMEditImagePropertyViewController: NSViewController {
             leftRotateVC?.updateUI()
             
             whVC?.background_hov = KMAppearance.view_bg_dis_color()
-//            whVC?.background_focus = KMAppearance.Layout.l1Color()
             whVC?.background_disabled = KMAppearance.buttonDisabledColor()
             
             reverseXVC?.borderColor = KMAppearance.Interactive.s0Color()
@@ -551,7 +526,6 @@ class KMEditImagePropertyViewController: NSViewController {
             self.leftRotateVC?.initDefaultValue()
             
             self.rotateTextFieldItemView.fillColor = .white
-//            self.rotateTextFieldItemView.updateUI(state: self.rotateTextFieldItemView.state)
             self.rotateTextFieldItemView.textF?.backgroundView.layer?.backgroundColor = .white
             if self.rotateTextFieldItemView.state == .Focus {
                 let borderColor = NSColor(hex: "68ACF8")
@@ -562,11 +536,6 @@ class KMEditImagePropertyViewController: NSViewController {
             }
         }
         
-//        for label in [self.whTitleLabel, self.opacityTitleLabel,
-//                      self.turnOverTitleLabel] {
-//            label?.font = NSFont.SFProTextSemiboldFont(12.0)
-//            label?.textColor = NSColor.km_init(hex: "#616469")
-//        }
     }
     
     func updateLanguage() {
@@ -611,12 +580,11 @@ class KMEditImagePropertyViewController: NSViewController {
                 self.buttonBox.isHidden = false
                 self.buttonBoxHeight.constant = 112+16+8
                 self.alignmentViewTopConstraint.constant = 16
-
+                
                 let opacity: CGFloat = self.listView.opacity(for: imagesAreas.first)
                 self.updateImageAreasOpacity(opacity: opacity, state: .ended, needListView: false)
                 self.turnOverBox.isHidden = false
                 self.opacityTitleLabel.isHidden = false
-//                self.whVC?.state = self._getKeepProportionsButtonState() ? .Act : .Norm
                 let whSta: KMDesignTokenState = self._getKeepProportionsButtonState() ? .Act : .Norm
                 self.whVC?.state = .Norm
                 self._setWHButtonState(whSta)
@@ -699,7 +667,6 @@ class KMEditImagePropertyViewController: NSViewController {
             
             self.wTextFieldItemView.textFiled.isEnabled = true
             self.hTextFieldItemView.textFiled.isEnabled = true
-//            self.whVC?.state = self._getKeepProportionsButtonState() ? .Act : .Norm
             let whSta: KMDesignTokenState = self._getKeepProportionsButtonState() ? .Act : .Norm
             self.whVC?.state = .Norm
             self._setWHButtonState(whSta)
@@ -794,13 +761,10 @@ class KMEditImagePropertyViewController: NSViewController {
                 }
             }
             
-//            self.listView.editingAreas()!.count == 1 &&
             if (self.listView.editingAreas()?.first is CPDFEditImageArea) {
                 self.listView.selectImageAreas = self.listView.editingAreas()!.first as? CPDFEditImageArea
-//                self.editImageView.image = self.listView.selectImageAreas.thumbnailImage
                 self.opacitySlider.objectValue = self.listView.opacity(for: self.listView.selectImageAreas)
                 self.opacityVC?.stringValue = Int(opacity * 100).description + "%"
-//                self.editImageView.alphaValue = opacity
             }
         }
     }
@@ -833,7 +797,6 @@ class KMEditImagePropertyViewController: NSViewController {
         let wEqual = self.handdler?.editAreasBoundsIsEqualForWidth() ?? false
         let hEqual = self.handdler?.editAreasBoundsIsEqualForHeight() ?? false
         if (wEqual && hEqual) {
-//            self.whVC?.state = self._getKeepProportionsButtonState() ? .Act : .Norm
             let state: KMDesignTokenState = self._getKeepProportionsButtonState() ? .Act : .Norm
             self.whVC?.state = .Norm
             self._setWHButtonState(state)
@@ -877,19 +840,16 @@ extension KMEditImagePropertyViewController {
     }
     
     @objc func whAction(_ sender: AnyObject) {
-//        let state = self.whVC?.state ?? .None
         let state = self.whState_
         if state == .Disabled {
             return
         }
         if state == .Act {
-//            self.whVC?.state = .Norm
             self.whVC?.state = .Norm
             self._setWHButtonState(.Norm)
             
             self._setKeepProportionsButtonState(state: false)
         } else {
-//            self.whVC?.state = .Act
             self.whVC?.state = .Norm
             self._setWHButtonState(.Act)
             
@@ -908,7 +868,6 @@ extension KMEditImagePropertyViewController {
             let imageArea = areas!.first as! CPDFEditImageArea
             self.listView.rotate(with: imageArea, rotate: 90)
             self.listView.selectImageAreas = imageArea
-//            self.editImageView.image = self.listView.selectImageAreas.thumbnailImage
         } else if areas!.count > 1 {
             for imagesArea in imagesAreas {
                 self.listView.rotate(with: imagesArea, rotate: 90)
@@ -930,7 +889,6 @@ extension KMEditImagePropertyViewController {
             if self.listView.editingAreas()!.count == 1 && (self.listView.editingAreas()!.first is CPDFEditImageArea) {
                 self.listView.selectImageAreas = self.listView.editingAreas()!.first as? CPDFEditImageArea
             }
-//            self.editImageView.image = self.listView.selectImageAreas.thumbnailImage
         } else {
             for imagesArea in imagesAreas {
                 self.listView.rotate(with: imagesArea, rotate: -90)
@@ -952,7 +910,6 @@ extension KMEditImagePropertyViewController {
                 if item is CPDFEditImageArea {
                     self.listView.horizontalMirror(with: item as? CPDFEditImageArea)
                     if areas?.count == 1 {
-//                        self.editImageView.image = (item as AnyObject).thumbnailImage
                     }
                 } else {
                     for imagesArea in imagesAreas {
@@ -976,7 +933,6 @@ extension KMEditImagePropertyViewController {
             for item in areas! {
                 if item is CPDFEditImageArea {
                     self.listView.verticalMirror(with: item as? CPDFEditImageArea)
-//                    self.editImageView.image = self.listView.selectImageAreas.thumbnailImage
                 } else {
                     for imagesArea in imagesAreas {
                         self.listView.verticalMirror(with: imagesArea)
@@ -1141,7 +1097,6 @@ extension KMEditImagePropertyViewController: KMTextFieldDelegate {
             let areas = self.handdler?.editingImageAreas ?? []
             self.listView.editAreaBoundUpdating = true
             for area in areas {
-//                let state =  self.whVC?.state ?? .None
                 let state = self.whState_
                 var bounds = area.bounds
                 var width = string?.stringToCGFloat() ?? 0
@@ -1157,7 +1112,6 @@ extension KMEditImagePropertyViewController: KMTextFieldDelegate {
                     self.wTextFieldItemView.stringValue = value
                 }
                 let wOffset = width-bounds.size.width
-//                bounds.origin.x = max(0, (pageBounds.size.width-width)*0.5)
                 bounds.origin.x = max(0, bounds.origin.x-wOffset * 0.5)
                 bounds.origin.x = min(bounds.origin.x, pageBounds.size.width-width)
                 
@@ -1174,7 +1128,7 @@ extension KMEditImagePropertyViewController: KMTextFieldDelegate {
                 } else {
                     bounds.size.width = width
                 }
-
+                
                 self.listView.setBoundsEditArea(area, withBounds: bounds)
             }
             
@@ -1186,19 +1140,16 @@ extension KMEditImagePropertyViewController: KMTextFieldDelegate {
             let string = self.hTextFieldItemView.textFiled.formatter?.string(for: number)
             self.hTextFieldItemView.stringValue = string ?? ""
             
-//            let areas = self.listView?.editingAreas() as? [CPDFEditArea] ?? []
             let areas = self.handdler?.editingImageAreas ?? []
             self.listView.editAreaBoundUpdating = true
             for area in areas {
-//            if let area = areas.first as? CPDFEditImageArea {
-//                let state =  self.whVC?.state ?? .None
                 let state = self.whState_
                 var bounds = area.bounds
                 var height = string?.stringToCGFloat() ?? 0
                 if height == 0 {
                     return
                 }
-
+                
                 let pageBounds = area.page?.bounds ?? .zero
                 if height > NSHeight(pageBounds) {
                     height = NSHeight(pageBounds)
@@ -1207,7 +1158,6 @@ extension KMEditImagePropertyViewController: KMTextFieldDelegate {
                     self.hTextFieldItemView.stringValue = value
                 }
                 let hOffset = height-bounds.size.height
-//                bounds.origin.y = max(0, (pageBounds.size.height-height)*0.5)
                 bounds.origin.y = max(0, bounds.origin.y-hOffset * 0.5)
                 bounds.origin.y = min(bounds.origin.y, pageBounds.size.height-height)
                 
@@ -1232,12 +1182,6 @@ extension KMEditImagePropertyViewController: KMTextFieldDelegate {
                 self._updateWHProportionButtonEnableState()
             }
         } else if self.rotateTextFieldItemView.isEqual(to: textField) {
-//            let stringValue = self.rotateTextFieldItemView.stringValue
-//            let number = NSNumber(value: Int(stringValue ?? "") ?? 0)
-//            let formatter = NumberFormatter()
-//            let string = formatter.string(for: number)
-//            let string = self.rotateTextFieldItemView.kFormatter?.string(for: number)
-//            self.rotateTextFieldItemView.stringValue = string
         }
     }
 }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -94,16 +94,7 @@ class KMSliderItemView: NSView {
     }
 }
 
-enum CPDFActiveAreasAlignType : Int {
-    case Left
-    case Vertical
-    case Right
-    case Top
-    case Horizontally
-    case Bottom
-    case DisHorizontally
-    case DisVertical
-}
+
 
 class KMEditPDFTextPropertyViewController: NSViewController {
     @IBOutlet weak var contentView: NSClipView!
@@ -164,7 +155,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
     @IBOutlet weak var fontReduceBox: NSBox!
     var fontAddVC: KMDesignButton?
     var fontReduceVC: KMDesignButton?
-
+    
     @IBOutlet weak var opacityBox: NSBox!
     var opacitVC: KMDesignSelect?
     var sliderItemView: KMSliderItemView?
@@ -188,7 +179,6 @@ class KMEditPDFTextPropertyViewController: NSViewController {
                         self.fontNameVC?.stringValue = fontName
                     }
                 } else {
-//                    self.fontNameVC?.stringValue = "Helvetica"
                     let areas = self.handdler?.editingTextAreas ?? []
                     if areas.count == 1 {
                         let cfont = self.listView.editingSelectionCFont(byRangeEdit: areas.first)
@@ -244,9 +234,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         self.addNotification()
         self.setup()
         self.initData()
-//        self.reloadData()
         self.updateLanguage()
-//        self.updatePreviewImage()
         self.updateUI()
         
         self.headerBox.isHidden = true
@@ -256,23 +244,21 @@ class KMEditPDFTextPropertyViewController: NSViewController {
     }
     
     func setup() {
-//        self.backgroundView.backgroundColor(KMAppearance.Layout.bgDrakColor())
         self.propertyTitle.font = NSFont.SFProTextSemiboldFont(14.0)
         self.propertyTitle.textColor = KMAppearance.Layout.h0Color()
-
+        
         self.fontTitleLabel.font = NSFont.SFProTextRegularFont(12.0)
         self.fontTitleLabel.textColor = KMAppearance.Layout.h0Color()
-
+        
         self.headerBox.borderWidth = 1
         self.headerBox.borderColor = KMAppearance.Interactive.s0Color()
         self.headerBox.cornerRadius = 4
         self.headerBox.fillColor = KMAppearance.Layout.l1Color()
         
-        //
         self.fontColorButton.border(NSColor.clear, 0, 10)
         self.fontColorButton.target = self
         self.fontColorButton.action = #selector(fontColorAction)
-        //alignment
+        
         leftAlignmentVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
         leftAlignmentBox.contentView = leftAlignmentVC?.view
         leftAlignmentBox.fillColor = NSColor.clear
@@ -310,7 +296,6 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         
         let familyNames = CPDFFont.familyNames
         fontNameVC = KMDesignSelect.init(withType: .PopButton)
-//        fontNameVC?.isScrollPop = true
         fontNameBox.contentView = fontNameVC?.view
         fontNameBox.fillColor = NSColor.clear
         fontNameVC?.addItems(withObjectValues: familyNames)
@@ -444,7 +429,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         textPresuppositionResetVC?.borderWidth_disabled = 1
         textPresuppositionResetVC?.borderColor_disabled = KMAppearance.view_border_dis_color()
         textPresuppositionResetVC?.updateUI()
-         
+        
         self.colorBox.borderColor = KMAppearance.Interactive.s0Color()
         
         let sliderItemView = KMSliderItemView()
@@ -457,7 +442,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         sliderItemView.maxValue = 1
         sliderItemView.valueChange = { [weak self] value in
             self?.opacitVC?.stringValue = String(format: "%0.f%%", value*100)
-             
+            
             if let data = self?.opacitVC {
                 self?.km_comboBoxSelectionDidChange(data)
             }
@@ -482,13 +467,6 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         
         self.alignmentView.didChange = { [unowned self] view, areasArray, boundsArray in
             self.changeAreasAlign(areas: areasArray, newBounds: boundsArray)
-            
-            self._trackEvent()
-            let textAreas = self.handdler?.editingTextAreas ?? []
-            let imageAreas = self.handdler?.editingImageAreas ?? []
-            if textAreas.count > 0 && imageAreas.count > 0 {
-                self._trackAlignEvent()
-            }
         }
         
         self.changeEffectiveAppearance()
@@ -576,24 +554,19 @@ class KMEditPDFTextPropertyViewController: NSViewController {
             self.fontReduceVC?.background_act = KMAppearance.Interactive.m1Color()
             self.fontReduceVC?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
             self.fontReduceVC?.borderColor_hov = KMAppearance.Interactive.a0Color()
-//            self.fontAddVC?.background_act = KMAppearance.Interactive.m1Color()
-//            self.fontAddVC?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-//            self.fontAddVC?.borderColor_hov = KMAppearance.Interactive.a0Color()
             self.fontReduceVC?.image_disabled = NSImage(named: "KMImageNameEditPDFFontReduceDisabled")!
             self.fontReduceVC?.background_disabled = NSColor(white: 96/255.0, alpha: 1.0)
             
             self.leftAlignmentVC?.background_sel = KMAppearance.Interactive.m1Color()
             self.centerAlignmentVC?.background_sel = KMAppearance.Interactive.m1Color()
             self.rightAlignmentVC?.background_sel = KMAppearance.Interactive.m1Color()
- 
+            
             let color = NSColor(hex: "#0E1114")
-//            fontNameVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
             fontNameVC?.popViewControllerBackground = color
         } else {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#FAFAFA"))
-
+            
             self.propertyTitle.textColor = KMAppearance.Layout.h0Color()
-//            self.fontTitleLabel.textColor = KMAppearance.Layout.h0Color()
             self.fontTitleLabel.textColor = NSColor(hex: "#616469")
             self.sliderItemView?.titleLabel.textColor = NSColor(hex: "#616469")
             self.alignmentView.alignmentLabel.textColor = NSColor(hex: "#616469")
@@ -684,19 +657,14 @@ class KMEditPDFTextPropertyViewController: NSViewController {
             
             self.fontItalicVC?.initDefaultValue()
             
-//            self.fontAddVC?.pagination()
             self.fontAddVC?.ignoreDisabledImage = true
             self.fontAddVC?.initDefaultValue()
             self.fontAddVC?.image = NSImage(named: "KMImageNameEditPDFFontAdd")!
-//            self.fontAddVC?.image_disabled = NSImage(named: "KMImageNameEditPDFFontAddDisabled")!
-//            self.fontAddVC?.background_disabled = NSColor.red
             self.fontAddVC?.background_disabled = KMAppearance.buttonDisabledColor()
             
             self.fontReduceVC?.ignoreDisabledImage = true
             self.fontReduceVC?.initDefaultValue()
             self.fontReduceVC?.image = NSImage(named: "KMImageNameEditPDFFontReduce")!
-//            self.fontAddVC?.image_disabled = NSImage(named: "KMImageNameEditPDFFontAddDisabled")!
-//            self.fontAddVC?.background_disabled = NSColor.red
             self.fontReduceVC?.background_disabled = KMAppearance.buttonDisabledColor()
         }
     }
@@ -754,7 +722,6 @@ class KMEditPDFTextPropertyViewController: NSViewController {
             if areas is CPDFEditTextArea  {
                 let area = areas as! CPDFEditTextArea
                 let cFont = self.listView.editingSelectionCFont(byRangeEdit: area)
-//                let cFont = self.listView.editingSelectionCFont(with: area)
                 var sizeString = "\(self.listView.editingSelectionFontSize(byRangeEdit: area))"
                 var fontName: String = cFont?.familyName ?? "Helvetica"
                 if fontName.count == 0 {
@@ -766,15 +733,9 @@ class KMEditPDFTextPropertyViewController: NSViewController {
                 }
                 let alignment = self.listView.currentSelectionAlignment(byRangeEdit: area)
                 let color = self.listView.editingSelectionFontColor(byRangeEdit: area) ?? NSColor.black
-//                fontName = KMEditPDFTextManager.manager.transformAreaTextFontName(fontName: fontName, fontNames: self.fontNameVC?.items ?? [])
                 
                 self.fontNameVC?.stringValue = cFont?.familyName == nil ? "--" : fontName
-//                if let data = self.listView?.isBoldCurrentSelection(byRangeEdit: area), data {
-//                    fontName += "-Bold"
-//                }
-//                if let data = self.listView?.isItalicCurrentSelection(byRangeEdit: area), data {
-//                    fontName += "-Italic"
-//                }
+                
                 //获取默认数据
                 if needDefaultData {
                     let model = KMEditPDFTextManager.manager.fetchUserDefaultData(type: .commonly)
@@ -784,21 +745,12 @@ class KMEditPDFTextPropertyViewController: NSViewController {
                 }
                 
                 self.updateTextTextPresuppositionState()
-//                var fontN = fontName
-//                if let data = cFont {
-//                    fontN = CPDFFont.convertAppleFont(data) ?? fontName
-//                }
                 self.updateTextPresupposition(fontName: fontName, style: fontStyle, size: CGFloat(Float(sizeString)!), needChangeListView: false)
                 self.currentColor = color
-//                DispatchQueue.main.async {
-//                    NSColorPanel.shared.color = color
-//                }
                 self.fontColorButton.image = self.swatchWithColor(color: color, size: NSSize(width: 20, height: 20))
                 self.alignment = alignment
                 self.selectAlignment(alignment: alignment)
                 
-//                self.updatePreviewImage()
-                
                 let opacity = self.listView.opacity(for: areas as? CPDFEditArea)
                 let sliderView = self.opacityBox.contentView as? KMSliderItemView
                 sliderView?.doubleValue = Double(opacity)
@@ -816,7 +768,6 @@ class KMEditPDFTextPropertyViewController: NSViewController {
             if let data = self.handdler?.editAreasFontNameIsEqual(), data {
                 if let area = self.handdler?.editingTextAreas.first {
                     let font = self.listView.editingSelectionCFont(byRangeEdit: area)
-//                    let font = self.listView.editingSelectionCFont(with: area)
                     self.fontNameVC?.stringValue = font?.familyName ?? ""
                 }
             } else {
@@ -825,7 +776,6 @@ class KMEditPDFTextPropertyViewController: NSViewController {
             
             if let data = self.handdler?.editAreasFontStyleIsEqual(), data {
                 if let area = self.handdler?.editingTextAreas.first {
-//                    if let styleName = self.listView.editingSelectionCFont(with: area)?.styleName, styleName.isEmpty == false {
                     if let styleName = self.listView.editingSelectionCFont(byRangeEdit: area)?.styleName, styleName.isEmpty == false {
                         self.fontStyleVC?.stringValue = styleName
                     } else {
@@ -930,8 +880,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
 //MARK: - Action
 extension KMEditPDFTextPropertyViewController {
     @IBAction func fontColorAction(_ sender: Any) {
-        self._trackEvent()
-        
+     
         let color = self.listView.editingSelectionFontColor(with: self.selectAreas.first as? CPDFEditTextArea)
         let panel = NSColorPanel.shared
         panel.setTarget(self)
@@ -944,7 +893,7 @@ extension KMEditPDFTextPropertyViewController {
             }
         }
     }
-
+    
     @objc func fontColorChangeAction() {
         let color = NSColorPanel.shared.color
         self.currentColor = color
@@ -959,7 +908,6 @@ extension KMEditPDFTextPropertyViewController {
         } else {
             KMEditPDFTextManager.manager.setCommonlyFontColor(color: self.currentColor)
         }
-//        self.updatePreviewImage()
     }
     
     @objc func fontBoldAction(_ sender: AnyObject) {
@@ -976,7 +924,7 @@ extension KMEditPDFTextPropertyViewController {
             self.fontBoldVC?.state = .Act
             boldV = true
         }
-
+        
         let index = self.textPresuppositionVC?.indexOfSelectedItem ?? 0
         let type = KMEditPDFTextFontType.typeOfRawValue(value: KMEditPDFTextFontType.allValues()[index])
         let model = KMEditPDFTextManager.manager.fetchUserDefaultData(type: type)
@@ -986,8 +934,7 @@ extension KMEditPDFTextPropertyViewController {
         KMEditPDFTextManager.manager.changeTextPresupposition(fontName: model_com.fontName, fontStyle: model_com.fontStyle, fontSize: model_com.fontSize, type: .commonly, bold: boldV, italic: nil)
         
         self.handdler?.fontBoldAction()
-        
-        self._trackEvent()
+       
     }
     
     @objc func fontItalicAction(_ sender: AnyObject) {
@@ -1013,8 +960,7 @@ extension KMEditPDFTextPropertyViewController {
         KMEditPDFTextManager.manager.changeTextPresupposition(fontName: model_com.fontName, fontStyle: model_com.fontStyle, fontSize: model_com.fontSize, type: .commonly, bold: nil, italic: italicV)
         
         self.handdler?.fontItalicAction()
-        
-        self._trackEvent()
+         
     }
     
     @objc func fontAddAction(_ sender: AnyObject) {
@@ -1026,8 +972,7 @@ extension KMEditPDFTextPropertyViewController {
         let size = Float(self.fontSizeVC?.stringValue.replacingOccurrences(of: "pt", with: "") ?? "12") ?? 1
         self.fontSizeVC?.stringValue = String(format: "%.0fpt", size+1)
         self.km_comboBoxSelectionDidChange(self.fontSizeVC!)
-        
-        self._trackEvent()
+         
     }
     
     @objc func fontReduceAction(_ sender: AnyObject) {
@@ -1042,8 +987,7 @@ extension KMEditPDFTextPropertyViewController {
         }
         self.fontSizeVC?.stringValue = String(format: "%.0fpt", size-1)
         self.km_comboBoxSelectionDidChange(self.fontSizeVC!)
-        
-        self._trackEvent()
+         
     }
     
     @objc func leftAlignmentAction(sender: NSButton?) {
@@ -1053,7 +997,7 @@ extension KMEditPDFTextPropertyViewController {
         self.updateAlignment(alignment: .left)
         if let _ = sender {
             KMEditPDFPopToolBarWindow.shared.updateTextAlign(align: .left)
-            self._trackEvent()
+ 
         }
     }
     
@@ -1066,8 +1010,7 @@ extension KMEditPDFTextPropertyViewController {
         if let _ = sender {
             KMEditPDFPopToolBarWindow.shared.updateTextAlign(align: .center)
         }
-        
-        self._trackEvent()
+         
     }
     
     @objc func rightAlignmentAction(sender: NSButton?) {
@@ -1079,8 +1022,6 @@ extension KMEditPDFTextPropertyViewController {
         if let _ = sender {
             KMEditPDFPopToolBarWindow.shared.updateTextAlign(align: .right)
         }
-        
-        self._trackEvent()
     }
     
     func selectAlignment(alignment: NSTextAlignment) {
@@ -1134,8 +1075,7 @@ extension KMEditPDFTextPropertyViewController {
         createFilePopover.behavior = .semitransient
         createFilePopover.setValue(true, forKey: "shouldHideAnchor")
         createFilePopover.show(relativeTo: CGRect(x: sender.bounds.origin.x, y: -10, width: sender.bounds.size.width, height: sender.bounds.size.height), of: sender, preferredEdge: .maxY)
-        
-//        vc.customBoxWidthLayoutConstraint.constant = self.popWidth ?? sender.frame.width
+         
         vc.downCallback = { [unowned self](downEntered: Bool, count: String) -> Void in
             if downEntered {
                 if count == NSLocalizedString("Reset", comment: "") {
@@ -1153,29 +1093,20 @@ extension KMEditPDFTextPropertyViewController {
         if areas is CPDFEditTextArea  {
             var size: CGFloat = (abs(self.listView.editingSelectionFontSize(byRangeEdit: areas as? CPDFEditTextArea)))
             let cfont = self.listView.editingSelectionCFont(byRangeEdit: areas as? CPDFEditTextArea)
-//            let cfont = self.listView.editingSelectionCFont(with: areas as? CPDFEditTextArea)
             var fontName = cfont?.familyName ?? "Helvetica"
-//            fontName = KMEditPDFTextManager.manager.transformAreaTextFontName(fontName: fontName, fontNames: self.fontNameVC?.items ?? [])
             
             var isBold = false
             if let data = self.listView?.isBoldCurrentSelection(byRangeEdit: areas as? CPDFEditTextArea) {
-//                fontName += "-Bold"
                 isBold = data
             }
             var isItalic = false
             if let data = self.listView?.isItalicCurrentSelection(byRangeEdit: areas as? CPDFEditTextArea) {
-//                fontName += "-Italic"
                 isItalic = data
             }
-//            var fontN = fontName
-//            if let data = cfont {
-//                fontN = CPDFFont.convertAppleFont(data) ?? fontName
-//            }
             
             let models = KMEditPDFTextManager.manager.fetchAllUserDefaultData()
             var index = 0
-            //  && model.bold == isBold && model.italic == isItalic
-            for i in 0...models.count - 1 {
+             for i in 0...models.count - 1 {
                 let model = models[i]
                 if model.fontName == fontName && model.fontStyle == cfont?.styleName && size == model.fontSize {
                     index = i
@@ -1203,7 +1134,6 @@ extension KMEditPDFTextPropertyViewController {
                 KMEditPDFTextManager.manager.setFontAlignment(alignment: alignment)
             }
             self.alignment = alignment
-//            self.updatePreviewImage()
         }
     }
     
@@ -1244,7 +1174,6 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
             self.updateTextPresupposition(type: type)
         } else if obj == fontNameVC {
             self.updateFontNameAndStyle(name: obj.stringValue, style: fontStyle)
-//            self.updatePreviewImage()
             let win = KMEditPDFPopToolBarWindow.shared
             if win.isVisible {
                 (win.contentViewController as? KMEditPDFPopToolBarController)?.toolbarView?.reloadData()
@@ -1252,12 +1181,10 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
         } else if obj == fontSizeVC {
             let size = CGFloat(Float((obj.stringValue.replacingOccurrences(of: "pt", with: "")))!)
             self.updateFontSize(size: size)
-//            self.updatePreviewImage()
             
             KMEditPDFPopToolBarWindow.shared.updateFontSizeButtons(enable: true)
         } else if obj == fontStyleVC {
             self.updateFontNameAndStyle(name: fontName, style: obj.stringValue)
-//            self.updatePreviewImage()
         } else if obj == self.opacitVC {
             let stringValue = self.opacitVC?.stringValue ?? ""
             let value = (stringValue.components(separatedBy: "%").first?.stringToCGFloat() ?? 0) / 100
@@ -1298,7 +1225,6 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
             return
         }
         if let label = cellView.contentView?.subviews.first as? NSTextField {
-            /* 14.0 "SFProText-Regular" */
             
             let allValues = KMEditPDFTextFontType.allValues()
             let idx = allValues.count-index-1
@@ -1326,10 +1252,9 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
             }
             let model = KMEditPDFTextManager.manager.fetchUserDefaultData(type: type)
             let fontName: String = model.fontName
-//            let size: CGFloat = model.fontSize
             var fontN: String = fontName
             if let cfont = CPDFFont.mappingFont(withFontString: fontName) {
-                 fontN = CPDFFont.convertAppleFont(cfont) ?? fontName
+                fontN = CPDFFont.convertAppleFont(cfont) ?? fontName
             }
             var bold = fontName.contains("Bold")
             var italic = fontName.contains("Oblique") || fontName.contains("Italic")
@@ -1340,33 +1265,22 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
                 italic = model.italic
             }
             
-//            if let data = NSFont(name: fontN, size: fontSidze) {
-//                let attri = NSMutableAttributedString(attributedString: label.attributedStringValue)
-//                attri.addAttribute(.font, value: data, range: NSMakeRange(0, attri.string.count))
-//                label.attributedStringValue = attri
-//            } else {
-                let attri = NSMutableAttributedString(attributedString: label.attributedStringValue)
-                if bold {
-                    attri.addAttribute(.font, value: NSFont.boldSystemFont(ofSize: fontSize), range: NSMakeRange(0, attri.string.count))
-                } else {
-                    attri.addAttribute(.font, value: NSFont.systemFont(ofSize: fontSize), range: NSMakeRange(0, attri.string.count))
-                }
-                if italic {
-                    attri.addAttribute(.obliqueness, value: 0.3, range: NSMakeRange(0, attri.string.count))
-                }
-                label.attributedStringValue = attri
-//            }
+            let attri = NSMutableAttributedString(attributedString: label.attributedStringValue)
+            if bold {
+                attri.addAttribute(.font, value: NSFont.boldSystemFont(ofSize: fontSize), range: NSMakeRange(0, attri.string.count))
+            } else {
+                attri.addAttribute(.font, value: NSFont.systemFont(ofSize: fontSize), range: NSMakeRange(0, attri.string.count))
+            }
+            if italic {
+                attri.addAttribute(.obliqueness, value: 0.3, range: NSMakeRange(0, attri.string.count))
+            }
+            label.attributedStringValue = attri
+            
         }
     }
     
     func km_SelectPopoverWillShow(_ obj: KMDesignSelect) {
-        if obj.isEqual(to: self.fontNameVC) {
-            self._trackEvent()
-        } else if obj.isEqual(to: self.fontStyleVC) {
-            self._trackEvent()
-        } else if obj.isEqual(to: self.fontSizeVC) {
-            self._trackEvent()
-        }
+        
     }
 }
 
@@ -1374,28 +1288,10 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
 extension KMEditPDFTextPropertyViewController {
     //MARK: 基本属性调整
     func updateTextPresupposition(fontName: String, style: String, size: CGFloat, needChangeListView: Bool = true) {
-//        let fontNameArray = fontName.components(separatedBy: "-")
-//        var name = ""
-//        var style = ""
-//        if fontNameArray.count > 0 {
-//            name = fontNameArray.first!
-//        } else {
-//            name = "Helvetica"
-//        }
-//
-//        if fontNameArray.count == 4 {
-//            style = "\(fontNameArray[2]) \(fontNameArray[3])"
-//        } else if fontNameArray.count == 3 {
-//            style = "\(fontNameArray[1]) \(fontNameArray[2])"
-//        } else if fontNameArray.count == 2 {
-//            style = fontNameArray.last!
-//        } else {
-//            style = "Regular"
-//        }
+        
         
         self.updateFontNameAndStyle(name: fontName, style: style, needChangeListView: needChangeListView, needSave: false)
         self.updateFontSize(size: size, needChangeListView: needChangeListView, needSave: false)
-//        self.updatePreviewImage()
     }
     
     func resetTextPresuppositionData() {
@@ -1422,27 +1318,21 @@ extension KMEditPDFTextPropertyViewController {
 }
 
 //MARK: - Private
-// 更新字体名称+字重
 
 extension KMEditPDFTextPropertyViewController {
-    // 更新字体名称 和 字重
     
     func updateFontNameAndStyle(name: String, style: String, needChangeListView: Bool = true, needSave: Bool = true) {
-        //        if fontName != name || fontStyle != style {
-//        let styleArray = defaultFontStyles //KMEditPDFTextManager.manager.fetchFontStyleWithFontName(fontName: name)
-//        var styleString = KMEditPDFTextManager.manager.checkFontStyle(style: style)
+        
         var styleString = style
         let fontStyleNames = CPDFFont.fontNames(forFamilyName: name)
         if !fontStyleNames.contains(style) {
             if fontStyleNames.isEmpty {
                 self.fontStyleVC?.addItems(withObjectValues: [style])
                 self.fontStyleVC?.selectItem(at: 0)
-    //            styleString = KMEditPDFTextManager.manager.checkFontStyle(style: self.fontStyleVC!.stringValue)
                 styleString = style
             } else {
                 self.fontStyleVC?.addItems(withObjectValues: fontStyleNames)
                 self.fontStyleVC?.selectItem(at: 0)
-    //            styleString = KMEditPDFTextManager.manager.checkFontStyle(style: self.fontStyleVC!.stringValue)
                 styleString = fontStyleNames.first ?? ""
             }
         } else {
@@ -1450,30 +1340,14 @@ extension KMEditPDFTextPropertyViewController {
             self.fontStyleVC?.selectItem(at: fontStyleNames.firstIndex(of: style) ?? 0)
         }
         
-//        var fontName = "\(name)-\(styleString)"
-//        if styleString.count == 0 {
-//            fontName = name
-//        }
-        
         //数据保存返回
         if self.selectAreas.count > 0 {
             if needChangeListView {
                 let areas = self.handdler?.editingTextAreas ?? []
                 for area in areas {
-//                    self.listView.setEditingSelectionFontName(name, with: area)
                     let font = CPDFFont(familyName: name, fontStyle: styleString)
                     self.listView.setEditSelectionCFont(font, with: area)
-//                    if styleString.contains("Bold") {
-//                        self.listView.setCurrentSelectionIsBold(true, with: area)
-//                    } else {
-//                        self.listView.setCurrentSelectionIsBold(false, with: area)
-//                    }
-//
-//                    if styleString.contains("Oblique") || styleString.contains("Italic") {
-//                        self.listView.setCurrentSelectionIsItalic(true, with: area)
-//                    } else {
-//                        self.listView.setCurrentSelectionIsItalic(false, with: area)
-//                    }
+                    
                 }
             }
         } else {
@@ -1484,7 +1358,6 @@ extension KMEditPDFTextPropertyViewController {
         }
         
         self.fontName = name
-//        self.fontStyle = self.fontStyleVC?.stringValue ?? "Regular"
         self.fontStyle = styleString
         
         if needSave {
@@ -1498,13 +1371,11 @@ extension KMEditPDFTextPropertyViewController {
         //刷新样式
         textPresuppositionVC?.addItems(withObjectValues: KMEditPDFTextManager.manager.updateTextPresuppositionFontNameArray())
         textPresuppositionVC?.selectItem(at: textPresuppositionVC!.indexOfSelectedItem)
-        //        }
         
         self._boldButtonStateUpdate(fontStyle: styleString)
     }
     
     func updateFontSize(size: CGFloat, needChangeListView: Bool = true, needSave: Bool = true) {
-        //        var fontSize = Float((self.fontSizeVC?.stringValue.replacingOccurrences(of: "pt", with: ""))!) ?? 8.0
         if fontSize != size {
             let areas = self.handdler?.editingTextAreas ?? []
             if areas.count > 0 {
@@ -1590,13 +1461,11 @@ extension KMEditPDFTextPropertyViewController {
         
         let editringareas = self.selectAreas
         let count = editringareas.count
-//        let editingSelectionString = self.listView.editingSelectionString()
         let editingSelectionAlignment = self.listView.editingSelectionAlignment(with: editringareas.first as? CPDFEditTextArea)
         
         if count == 1 {
             let areas = editringareas.first
             if areas is CPDFEditTextArea {
-//                string = editingSelectionString ?? NSLocalizedString("Sample", comment: "")
                 alignment = editingSelectionAlignment
             }
         }
@@ -1612,13 +1481,6 @@ extension KMEditPDFTextPropertyViewController {
     func supportFontSize() -> [String] {
         return ["8pt", "9pt", "10pt", "11pt", "12pt", "14pt", "16pt", "18pt", "20pt", "22pt", "24pt", "26pt", "28pt", "36pt", "48pt", "72pt"]
     }
-    
-    private func _trackEvent() {
-        kTrackEventManager.trackEvent(event: "SubTbr_EditPDF", withProperties: ["SubTbr_EditText":"SubTbr_EditText_PropertiesPanel_All"])
-    }
-    
-    private func _trackAlignEvent() {
-        kTrackEventManager.trackEvent(event: "SubTbr_EditPDF", withProperties: ["SubTbr_EditText":"SubTbr_EditContent_AlignContent"])
-    }
+     
 }
 

PDF Office/PDF Master/Class/PDFTools/EditPDF/Model/KMEditPDFModel.swift

@@ -7,9 +7,7 @@
 
 import Cocoa
 
-class KMEditPDFModel: NSObject {
-//
-//    var cFont: CPDFFont?
+class KMEditPDFModel: NSObject { 
     var editingAreas: [CPDFEditArea]?
     
     var textAreas: [CPDFEditTextArea]? {
@@ -219,10 +217,6 @@ class KMEditPDFModel: NSObject {
         if datas.isEmpty {
             return false
         }
-//        if self.editAreasHavTextArea() {
-//            return false
-//        }
-//        let datas = self._editAreasRotates()
         if datas.count == 1 {
             return true
         }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/Manager/KMEditPDFTextManager.swift

@@ -38,6 +38,17 @@ let ALIGNMENT_KEY = "FontAlignment"
 let Bold_KEY = "bold"
 let Italic_KEY = "italic"
 
+enum CPDFActiveAreasAlignType : Int {
+    case Left
+    case Vertical
+    case Right
+    case Top
+    case Horizontally
+    case Bottom
+    case DisHorizontally
+    case DisVertical
+}
+
 //字体样式类型
 enum KMEditPDFTextFontType: String, CaseIterable {
     case commonly = "Commonly"
@@ -141,11 +152,7 @@ extension KMEditPDFTextManager {
                 fontNameArray.append(fontName as! String)
             }
             textFontNames = fontNameArray
-            
-//            if listView != nil {
-//                textFontNames = listView!.getEditFontList() as? [String] ?? []
-//                textFontNames.sort()
-//            }
+             
         }
         return textFontNames
     }
@@ -335,9 +342,7 @@ extension KMEditPDFTextManager {
     }
     
     func setCommonlyFontColor(color: NSColor) {
-//        UserDefaults.standard.setPDFListViewColor(color, forKey: FontColor_USERDEFAULTS)
-//        UserDefaults.standard.synchronize()
-        
+ 
         let userDefaults = UserDefaults.standard
         let model = self.fetchUserDefaultData(type: .commonly)
         let colorString: String = color.toHex(alpha: true) ?? ""
@@ -365,7 +370,7 @@ extension KMEditPDFTextManager {
         }
         
         if style.contains("BoldOblique") || style.contains("BoldItalic") {
-//            result = "Bold Oblique"
+ 
         }
         return result
     }
@@ -445,8 +450,7 @@ extension KMEditPDFTextManager {
 extension KMEditPDFTextManager {
     //设置相应的字体样式
     private func setTextPresupposition(fontName: String, fontStyle: String, fontSize: CGFloat, redefine: Bool = false, change: Bool = false, type: KMEditPDFTextFontType, bold: Bool?, italic: Bool?) {
-//        let tempFontName = self.checkFontName(fontName: fontName)
-        let model = self.fetchUserDefaultData(type: type)
+         let model = self.fetchUserDefaultData(type: type)
         let colorString: String = model.color.toHex(alpha: true) ?? ""
         var boldV = model.bold
         if let data = bold {
@@ -524,14 +528,7 @@ extension KMEditPDFTextManager {
         let change = data[CHANGE_KEY] as? Bool ?? CHANGE_DEFAULT
         let colorString = data[COLOR_KEY] as? String ?? COLOR_DEFAULT
         let alignment = NSTextAlignment(rawValue: data[ALIGNMENT_KEY] as? Int ?? 0) ?? NSTextAlignment.left
-        //特殊情况处理
-//        if fontName.contains("BoldOblique") {
-//            let fontNameArray = fontName.components(separatedBy: "-")
-//            if fontNameArray.count > 0 {
-//                fontName = fontNameArray.first! + "-" + "Bold Oblique"
-//            }
-//        }
-        
+ 
         let fontStyle = data[FONTStyle_KEY] as? String ?? FONTStyle_DEFAULT
         let bold = data[Bold_KEY] as? Bool ?? false
         let italic = data[Italic_KEY] as? Bool ?? false
@@ -548,9 +545,7 @@ extension KMEditPDFTextManager {
         resultModel.fontStyle = fontStyle
         resultModel.bold = bold
         resultModel.italic = italic
-//        if type == .customize {
-//            resultModel.color = UserDefaults.standard.pdfListViewColor(forKey: FontColor_USERDEFAULTS) ?? NSColor.black
-//        }
+ 
         return resultModel
     }
 }

PDF Office/PDF Master/Class/PDFTools/EditPDF/Tools/KMEditPDfHanddler.swift

@@ -87,13 +87,7 @@ class KMEditPDfHanddler: NSObject {
             return self.rightViewC?.subViewType ?? .None
         }
     }
-    
-//    var toolMode: CToolMode {
-//        get {
-//            return
-//        }
-//    }
-    
+     
     var isEditImage: Bool {
         get {
             return self.listView?.isEditImage ?? false
@@ -192,35 +186,23 @@ class KMEditPDfHanddler: NSObject {
         
         // 设置边框颜色
         self.editingConfig?.editingBorderColor = .clear
-        // 设置边框宽度
-//        self.editingConfig?.editingBorderWidth = 10
-        // 内容与边框的间距
-//        self.editingConfig?.editAreaMargin = .init(floatLiteral: 5)
-        // 设置选中块边框颜色
-//        self.editingConfig?.editingSelectionBorderColor = .red
-        // 显示hover边框
+ 
         self.editingConfig?.isShowMouseAreaHover = true
-        
-        // hover
-        // 边框宽度
-//        self.editingConfig?.mouseHoverBorderWidth = 1
+      
         // 边框颜色
         self.editingConfig?.mouseHoverBorderColor = NSColor(hex: "#999999")
         // 边框虚线设置
         self.editingConfig?.mouseHoverBorderDashPattern = [3,3,3]
         // 块填充颜色(拖拽中)
-//        self.editingConfig?.editAreaMoveFillColor = .cyan
-        // 是否显示位置辅助线
+         // 是否显示位置辅助线
         self.editingConfig?.isShowEditingAreaHover = true
         // 辅助线颜色
-//        self.editingConfig?.editingHoverBorderColor = .brown
-        // 支持多选
+         // 支持多选
         self.editingConfig?.isSupportMultipleSelectEditingArea = true
         // 图片是否显示8个操作点
         self.editingConfig?.isDrawRectWithDot = true
         
-//        self.editingConfig?.editingMouseSelectionBorderColor
-        self.editingConfig?.editingMouseSelectionBorderWidth = 1
+         self.editingConfig?.editingMouseSelectionBorderWidth = 1
         self.editingConfig?.editingMouseSelectionBorderDashPattern = [3, 3, 3]
     }
     
@@ -300,8 +282,7 @@ class KMEditPDfHanddler: NSObject {
         var maxX = NSMaxX(areaBounds)
         var maxY = NSMaxY(areaBounds)
         for area in self.editingAreas {
-//            let bounds = area.bounds
-            let bounds = (self.listView?.convert(area.bounds, from: area.page) as? NSRect) ?? .zero
+             let bounds = (self.listView?.convert(area.bounds, from: area.page) as? NSRect) ?? .zero
             areaBounds.origin.x = min(areaBounds.origin.x, bounds.origin.x)
             areaBounds.origin.y = min(areaBounds.origin.y, bounds.origin.y)
             
@@ -447,8 +428,7 @@ class KMEditPDfHanddler: NSObject {
                 var maxX = NSMaxX(areaBounds)
                 var maxY = NSMaxY(areaBounds)
                 for area in self.editingAreas {
-    //            let bounds = area.bounds
-                    let bounds = (self.listView?.convert(area.bounds, from: area.page) as? NSRect) ?? .zero
+                     let bounds = (self.listView?.convert(area.bounds, from: area.page) as? NSRect) ?? .zero
                     areaBounds.origin.x = min(areaBounds.origin.x, bounds.origin.x)
                     areaBounds.origin.y = min(areaBounds.origin.y, bounds.origin.y)
                 
@@ -547,9 +527,7 @@ extension KMEditPDfHanddler {
     @objc private func _scrollViewDidScroll(_ noti: Notification) {
         if let data = self.listView?.documentView().isEqual(to: noti.object), data {
             let win = KMEditPDFPopToolBarWindow.shared
-            if win.isVisible == false {
-//                return
-            }
+           
             guard let area = (self.listView?.editingAreas()?.first as? CPDFEditArea) else {
                 self.hiddenPopWindow()
                 self.hiddenCropComfirmWindow()
@@ -571,10 +549,7 @@ extension KMEditPDfHanddler {
                 position.y += 26
                 
                 var x = position.x + (NSWidth(areaBounds)-84) * 0.5
-//                let frame = NSMakeRect(x, position.y, 84, 44)
-                
-//                position.x += (areaBounds.size.width*0.5-win.frame.size.width*0.5)
-                x = max(0, x)
+                 x = max(0, x)
                 var y = max(0, position.y)
                 
                 let screenFrame = NSScreen.main?.frame ?? .zero
@@ -598,8 +573,7 @@ extension KMEditPDfHanddler {
             var maxX = NSMaxX(areaBounds)
             var maxY = NSMaxY(areaBounds)
             for area in self.editingAreas {
-    //            let bounds = area.bounds
-                let bounds = (self.listView?.convert(area.bounds, from: area.page) as? NSRect) ?? .zero
+                 let bounds = (self.listView?.convert(area.bounds, from: area.page) as? NSRect) ?? .zero
                 areaBounds.origin.x = min(areaBounds.origin.x, bounds.origin.x)
                 areaBounds.origin.y = min(areaBounds.origin.y, bounds.origin.y)
                 
@@ -623,21 +597,16 @@ extension KMEditPDfHanddler {
             position.y += 26
             
             position.x += (areaBounds.size.width*0.5-win.frame.size.width*0.5)
-//            var x = max(0, position.x)
-            var x = max(winFrame.origin.x, position.x)
+             var x = max(winFrame.origin.x, position.x)
             let width = win.frame.size.width
             let offsetX = x + width - NSMaxX(winFrame)
             if offsetX > 0 { // 超出右编辑
                 x -= offsetX
             }
             var y = max(0, position.y)
-            
-//            let screenFrame = NSScreen.main?.frame ?? .zero
-//            let winMaxY = NSMaxY(winFrame)
+             
             let height = NSHeight(winFrame)
             if y + 44 + 40-20 >= height {
-//            if y + 44 + 40 + 40 >= screenFrame.size.height {
-//                y = screenFrame.size.height - 44 - 40 - 40
                 y = height - 44 - 40 + 20
             }
             
@@ -831,8 +800,7 @@ extension KMEditPDfHanddler {
             }
             
             if abs(width-rect.size.width) > 0.01 {
-//            if width != rect.size.width {
-                return false
+                 return false
             }
         }
         return true
@@ -851,8 +819,7 @@ extension KMEditPDfHanddler {
             if i == 0 {
                 continue
             }
-//            if height != rect.size.height {
-            if abs(height-rect.size.height) > 0.01 {
+             if abs(height-rect.size.height) > 0.01 {
                 return false
             }
         }
@@ -906,8 +873,7 @@ extension KMEditPDfHanddler {
         var datas: [NSColor] = []
         for area in self.editingTextAreas {
             if let data = self.listView?.editingSelectionFontColor(with: area) {
-//            if let data = self.listView?.editingSelectionFontColor(byRangeEdit: area) {
-                datas.append(data)
+                 datas.append(data)
             }
         }
         return datas
@@ -917,8 +883,7 @@ extension KMEditPDfHanddler {
         var datas: [String] = []
         for area in self.editingTextAreas {
             if let data = self.listView?.editingSelectionCFont(byRangeEdit: area)?.styleName {
-//            if let data = self.listView?.editingSelectionCFont(with: area)?.familyName {
-                datas.append(data)
+                 datas.append(data)
             }
         }
         return datas
@@ -928,8 +893,7 @@ extension KMEditPDfHanddler {
         var datas: [String] = []
         for area in self.editingTextAreas {
             if let data = self.listView?.editingSelectionCFont(byRangeEdit: area)?.familyName {
-//            if let data = self.listView?.editingSelectionCFont(with: area)?.familyName {
-                datas.append(data)
+                 datas.append(data)
             }
         }
         return datas
@@ -1203,8 +1167,7 @@ extension KMEditPDfHanddler {
     }
     
     func showExportMenu(_ sender: NSView) {
-//        let menuI = NSMenuItem()
-        let submenu = NSMenu(title: "")
+         let submenu = NSMenu(title: "")
         let jpgMI = submenu.addItem(withTitle: "jpg", action: #selector(exportMenuItemAction), keyEquivalent: "")
         jpgMI.target = self
         jpgMI.tag = 1
@@ -1535,20 +1498,15 @@ extension KMEditPDfHanddler: CPDFViewDelegate {
                     if self.isEditImage {
                         self.viewC?.menuItemEditingClick_CropImage(sender: NSMenuItem())
                     } else {
-//                        if self.listView.annotationType == .addImage {
-//                            self.closeRightPane()
-//                        }
                         if annotationType == .addImage {
                             if self.rightViewC?.eidtPDFImageProperty != nil {
                                 self.rightViewC?.eidtPDFImageProperty.handdler = self
                                 self.rightViewC?.eidtPDFImageProperty.reloadData()
                             }
                         }
-//                        self.openRightPane()
-                    }
+                     }
                 } else {
-//                    self.viewC?.closeRightPane()
-                    self.rightViewC?.isHidden = true
+                     self.rightViewC?.isHidden = true
                 }
                 self.listView?.isEditImage = false
             } else {
@@ -1582,8 +1540,7 @@ extension KMEditPDfHanddler: CPDFViewDelegate {
                 self.openRightPane()
             } else {
                 self.rightViewC?.isHidden = true
-//                self.viewC?.closeRightPane()
-            }
+             }
         } else if self.subViewType == .EditPDFAddText && annotationType == .addText {
             self.rightViewC?.isHidden = false
             let count = self.listView?.editingSelectionString()?.count ?? 0
@@ -1774,15 +1731,12 @@ extension KMEditPDfHanddler: CPDFViewDelegate {
         }
         
         let model = KMEditPDFTextManager.manager.fetchUserDefaultData(type: .commonly)
-//        let fontName = KMEditPDFTextManager.manager.fetchFontName(fontName: model.fontName)
-        let fontSize = model.fontSize
+         let fontSize = model.fontSize
         let fontColor = model.color
         let fontAlign = model.alignment
-//        let fontStyle = KMEditPDFTextManager.manager.fetchFontStyle(fontName: model.fontName)
-        NSColorPanel.shared.color = fontColor
+         NSColorPanel.shared.color = fontColor
 
-//        let font = KMEditPDFTextManager.manager.fetchFont(fontName: fontName, style: fontStyle, size: fontSize)
-        
+ 
         let cfont = CPDFFont(familyName: model.fontName, fontStyle: model.fontStyle)
         let fontNameZ = CPDFFont.convertAppleFont(cfont)
         let font = NSFont(name: fontNameZ ?? "Helvetica", size: fontSize)
@@ -1855,9 +1809,7 @@ extension KMEditPDfHanddler: CPDFViewDelegate {
         }
         
         if self.subViewType == .EditPDFAddText {
-//            self.rightViewC?.eidtPDFTextProperty.reloadData()
-//            self.rightViewC?.eidtPDFTextProperty.updateTextTextPresuppositionState()
-            
+ 
             if self.addTextAreaing == false && self.fontSizeChanging == false && self.textAlignChanging == false {
                 self.showPopWindow(positionRect: .zero, showGuide: false)
                 self._reloadData_right_text()

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -8662,6 +8662,9 @@
 			isa = PBXGroup;
 			children = (
 				AD6260712A9D9695006C6413 /* Source */,
+				BB6AAF4C2C21721B009C4CB1 /* Controller */,
+				BB6AAF592C217F94009C4CB1 /* Window */,
+				BB71853B2C2B0A6900C1156B /* Toolbar */,
 				AD58C0FB2A1F2D3C00F911A0 /* Category */,
 				AD3C6DFA2A1C48600010B1A7 /* Manager */,
 				ADC31FA92A0E0C1E00ED44A2 /* View */,
@@ -9013,7 +9016,6 @@
 			isa = PBXGroup;
 			children = (
 				9FF371AB2C69A67B005F9CC5 /* Measure */,
-				BB6AAF4A2C21721B009C4CB1 /* EditPDF */,
 				AD055E1A2B70B2460035F824 /* KMBookmark */,
 				ADFA8F072B57861A002595A4 /* FindSearch */,
 				AD2BF23B2B5647C80029F03F /* AutoFlow */,
@@ -10073,6 +10075,8 @@
 		AD3C6DFA2A1C48600010B1A7 /* Manager */ = {
 			isa = PBXGroup;
 			children = (
+				BB7185492C2B0DC500C1156B /* KMEditPDFModel.swift */,
+				BB6AAF4D2C217248009C4CB1 /* KMEditPDfHanddler.swift */,
 				ADA910292A272CE2003352F0 /* KMEditPDFTextManager.swift */,
 			);
 			path = Manager;
@@ -10185,13 +10189,6 @@
 			path = KMResourceDownload;
 			sourceTree = "<group>";
 		};
-		AD68781F29A5FADC005B5210 /* Cache */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Cache;
-			sourceTree = "<group>";
-		};
 		AD68782829A60130005B5210 /* Login&Register */ = {
 			isa = PBXGroup;
 			children = (
@@ -10674,6 +10671,9 @@
 		ADC31FA92A0E0C1E00ED44A2 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				BB4D02A82C22D17B0001474A /* KMEditPDFPopGuideView.swift */,
+				BB6985582C2A94BD007D307D /* KMGuideTargetView.swift */,
+				BB7185442C2B0AFC00C1156B /* KMEditPDFColorView.swift */,
 				ADC31FAA2A0E0C2500ED44A2 /* AlignmentView */,
 			);
 			path = View;
@@ -10962,7 +10962,6 @@
 				AD53B70129ACC63D00D61E81 /* Tools */,
 				AD015FB529AB483200A57062 /* Config */,
 				ADF1569A29A63CAB001D1018 /* Source */,
-				AD68781F29A5FADC005B5210 /* Cache */,
 				ADE3C1E129A5AB8B00793B13 /* Controller */,
 				ADE3C1D729A5A9AB00793B13 /* KMRequestServer */,
 				ADE3C1D029A5A8B200793B13 /* Manager */,
@@ -12629,16 +12628,6 @@
 			path = OCR;
 			sourceTree = "<group>";
 		};
-		BB4D02A72C22D1510001474A /* View */ = {
-			isa = PBXGroup;
-			children = (
-				BB4D02A82C22D17B0001474A /* KMEditPDFPopGuideView.swift */,
-				BB6985582C2A94BD007D307D /* KMGuideTargetView.swift */,
-				BB7185442C2B0AFC00C1156B /* KMEditPDFColorView.swift */,
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 		BB4EEF2929763EC7003A3537 /* Window */ = {
 			isa = PBXGroup;
 			children = (
@@ -13024,27 +13013,6 @@
 			path = Resource;
 			sourceTree = "<group>";
 		};
-		BB6AAF4A2C21721B009C4CB1 /* EditPDF */ = {
-			isa = PBXGroup;
-			children = (
-				BB7185482C2B0DA600C1156B /* Model */,
-				BB71853B2C2B0A6900C1156B /* Toolbar */,
-				BB4D02A72C22D1510001474A /* View */,
-				BB6AAF592C217F94009C4CB1 /* Window */,
-				BB6AAF4B2C21721B009C4CB1 /* Tools */,
-				BB6AAF4C2C21721B009C4CB1 /* Controller */,
-			);
-			path = EditPDF;
-			sourceTree = "<group>";
-		};
-		BB6AAF4B2C21721B009C4CB1 /* Tools */ = {
-			isa = PBXGroup;
-			children = (
-				BB6AAF4D2C217248009C4CB1 /* KMEditPDfHanddler.swift */,
-			);
-			path = Tools;
-			sourceTree = "<group>";
-		};
 		BB6AAF4C2C21721B009C4CB1 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
@@ -13170,14 +13138,6 @@
 			path = Toolbar;
 			sourceTree = "<group>";
 		};
-		BB7185482C2B0DA600C1156B /* Model */ = {
-			isa = PBXGroup;
-			children = (
-				BB7185492C2B0DC500C1156B /* KMEditPDFModel.swift */,
-			);
-			path = Model;
-			sourceTree = "<group>";
-		};
 		BB7289DE2B8838BC004B53B5 /* DataManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -13579,7 +13539,6 @@
 				652E953A2C66707E0061FA40 /* Freehand */,
 				89E4E6D72963C6AA002DBA6F /* AnnotationProperty */,
 				BB8B17302907B48E001C5EA5 /* CipherTextView */,
-				8996CFE4295BE15800D32783 /* EditPDF */,
 				BBB5C80629F4CEE40054F261 /* KMLinkAnnotationPropertyEmptyController.swift */,
 				9FD0FA2729CD3ED400F2AB0D /* KMRightSideEmptyVC.swift */,
 				9FD0FA2829CD3ED400F2AB0D /* KMRightSideEmptyVC.xib */,
@@ -14363,6 +14322,7 @@
 		BBEB0DE62CE36B54004C67BF /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				8996CFE4295BE15800D32783 /* EditPDF */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -19920,7 +19880,6 @@
 				F3A65ECF2CDF19C300F00102 /* KMNThumDecorationView.swift in Sources */,
 				ADD56F592BB3F48300E87ED9 /* KMFreeTextStylesViewController.m in Sources */,
 				BBFE6E772930E53000142C01 /* KMMergePopoverViewController.swift in Sources */,
-				ADF6B8782A48155E0090CB78 /* KMComparativeViewCollectionItem.swift in Sources */,
 				65202DF92CE4803500A204B5 /* KMNBotaHeaderSearchView.swift in Sources */,
 				BB65A07A2AF8E2F2003A27A0 /* KMSyncPreferences.swift in Sources */,
 				BB32BF252A5EA05900D11348 /* KMAnalytics.swift in Sources */,