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

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

@@ -14,6 +14,17 @@ public enum KMOperationState {
     case ended
 }
 
+enum KMEditImagePropertyViewControllerChangeType {
+    case rotate
+    case flip
+    case add
+    case move
+}
+
+protocol KMEditImagePropertyViewControllerDelegate: NSObject {
+    func editImagePropertyViewControllerDidChanged(controller: KMEditImagePropertyViewController, type: KMEditImagePropertyViewControllerChangeType)
+}
+
 class KMEditImagePropertyViewController: NSViewController {
 
     @IBOutlet weak var titleLabel: NSTextField!
@@ -69,6 +80,7 @@ class KMEditImagePropertyViewController: NSViewController {
         }
     }
     
+    weak var delegate: KMEditImagePropertyViewControllerDelegate?
     override func viewDidLoad() {
         super.viewDidLoad()
     
@@ -402,6 +414,8 @@ extension KMEditImagePropertyViewController {
                 self.listView.rotate(with: imagesArea, rotate: 90)
             }
         }
+        
+        self.delegate?.editImagePropertyViewControllerDidChanged(controller: self, type: .rotate)
     }
     
     @IBAction func leftRotationImageAction(_ sender: Any) {
@@ -420,6 +434,8 @@ extension KMEditImagePropertyViewController {
                 self.listView.rotate(with: imagesArea, rotate: -90)
             }
         }
+        
+        self.delegate?.editImagePropertyViewControllerDidChanged(controller: self, type: .rotate)
     }
     
     @IBAction func flipHorizontalImageAction(_ sender: Any) {
@@ -441,6 +457,8 @@ extension KMEditImagePropertyViewController {
                 }
             }
         }
+        
+        self.delegate?.editImagePropertyViewControllerDidChanged(controller: self, type: .flip)
     }
     
     @IBAction func flipVerticalImageAction(_ sender: Any) {
@@ -460,6 +478,7 @@ extension KMEditImagePropertyViewController {
                 }
             }
         }
+        self.delegate?.editImagePropertyViewControllerDidChanged(controller: self, type: .flip)
     }
     
     @IBAction func cutImageAction(_ sender: Any) {

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

@@ -111,7 +111,6 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         self.initData()
         self.reloadData()
         self.updateLanguage()
-//        self.listView.isEditImage = true
     }
     
     func setup() {

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

@@ -53,7 +53,7 @@
                         <subviews>
                             <box boxType="custom" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="UXh-hG-Hue">
                                 <rect key="frame" x="16" y="512" width="228" height="88"/>
-                                <view key="contentView" hidden="YES" id="ZNj-I9-Lej">
+                                <view key="contentView" id="ZNj-I9-Lej">
                                     <rect key="frame" x="1" y="1" width="226" height="86"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/KMRightSideViewController.swift

@@ -36,6 +36,8 @@ class KMRightSideViewController: NSViewController,CipherTextViewDelegate {
     var propertyDidChange: KMRightSidePropertyDidChange!
     var model: AnyObject?
     
+    weak var delegate: KMEditImagePropertyViewControllerDelegate?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do view setup here.
@@ -192,6 +194,7 @@ class KMRightSideViewController: NSViewController,CipherTextViewDelegate {
     private func initEditPDFImagePropertyViewController() {
         self.eidtPDFImageProperty = KMEditImagePropertyViewController()
         self.eidtPDFImageProperty.listView = self.listView
+        self.eidtPDFImageProperty.delegate = self
         self.eidtPDFImageProperty.view.frame = self.view.bounds
         self.eidtPDFImageProperty.view.autoresizingMask = [.height]
         self.contextBox.contentView =  self.eidtPDFImageProperty.view
@@ -298,3 +301,9 @@ class KMRightSideViewController: NSViewController,CipherTextViewDelegate {
     }
     
 }
+
+extension KMRightSideViewController: KMEditImagePropertyViewControllerDelegate {
+    func editImagePropertyViewControllerDidChanged(controller: KMEditImagePropertyViewController, type: KMEditImagePropertyViewControllerChangeType) {
+        self.delegate?.editImagePropertyViewControllerDidChanged(controller: controller, type: type)
+    }
+}

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -2636,7 +2636,8 @@ extension KMMainViewController: KMPageNumberDisplayViewDelegate {
     }
     
     func commitEditingIfNeed() {
-        if let isEdited = self.listView?.isEdited(), isEdited {
+        let isEdited = self.listView?.isEdited() ?? false
+        if isEdited || self.isPDFTextImageEdited {
             self.listView.commitEditing()
         }
     }

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -69,6 +69,8 @@ import Cocoa
     }
     // 标识 pdf 已编辑
     internal var _isPDFDocumentEdited = false
+    // 标识 pdf文字图片已编辑
+    internal var isPDFTextImageEdited = false
     var isPDFDocumentEdited: Bool {
         get {
             return _isPDFDocumentEdited
@@ -331,6 +333,7 @@ import Cocoa
         self.rightSideViewController.listView = self.listView
 //        self.rightSideViewController.view.isHidden = true
         self.rightSideViewController.isHidden = true
+        self.rightSideViewController.delegate = self
         self.rightView.addSubview(self.rightSideViewController.view)
         self.rightSideViewController.propertyDidChange = {
             [weak self] (model: AnyObject?) in
@@ -1355,6 +1358,7 @@ import Cocoa
                         imageRect.size = newSize
                         
                         self.listView.createImagePath(openPath!, rect: imageRect, page: pdfView.currentPage())
+                        self.isPDFTextImageEdited = true
                     }
                 }
             }
@@ -1853,3 +1857,9 @@ import Cocoa
     }
 }
 
+extension KMMainViewController: KMEditImagePropertyViewControllerDelegate {
+    func editImagePropertyViewControllerDidChanged(controller: KMEditImagePropertyViewController, type: KMEditImagePropertyViewControllerChangeType) {
+        self.isPDFTextImageEdited = true
+    }
+}
+