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

PDF Office/PDF Master/Class/PDFTools/Print/Model/KMPrintPaperModel.swift

@@ -84,7 +84,7 @@ struct KMPrintPaperInfo {
         static func allValues() -> [String] {
             var array: [String] = []
             for key in KMPaperType.allCases {
-                array.append(key.rawValue)
+                array.append(NSLocalizedString(key.rawValue, comment: ""))
             }
             return array
         }

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

@@ -23,6 +23,7 @@ class KMPrintPreviewView: KMBaseXibView {
     @IBOutlet weak var partitionLabel: NSTextField!
     
     var isPrintPreView: Bool = true
+    var reversePrintOrder: Bool = false
     var password: String = ""
     var model: KMPrintModel? {
         didSet {
@@ -39,7 +40,8 @@ class KMPrintPreviewView: KMBaseXibView {
             self.previewView.displayMode = .singlePage
             self.previewView.documentView?.enclosingScrollView?.scrollerStyle = .overlay
             if model?.page.operation.type == .poster {
-                self.presenter.pdfView = self.previewView
+//                self.presenter.pdfView = self.previewView
+                self.presenter.initPresenter(delegate: self, view: self.previewView)
             } else {
                 self.presenter.initPresenter(delegate: self, view: self.previewView)
             }
@@ -110,7 +112,7 @@ class KMPrintPreviewView: KMBaseXibView {
         self.currentPageTextField.textField.font = NSFont.SFProTextRegularFont(12.0)
 //        self.currentPageTextField.textField.textColor = NSColor.km_init(hex: "#252629")
         self.currentPageTextField.textDidEndEditing = {[unowned self] (string) in
-            self.presenter.toPage(index: Int(string) ?? 0)
+            self.presenter.toPage(index: max((Int(string) ?? 0) - 1, 0))
         }
         
 //        self.partitionLabel.textColor = NSColor.km_init(hex: "#252629")
@@ -231,6 +233,26 @@ extension KMPrintPreviewView {
     //        self.posterPreView.spaceHeight = spaceHeight
             self.posterPreView.scale = 1
             self.posterPreView.needsDisplay = true
+            
+            if model.page.range.reversePrintOrder != reversePrintOrder {
+                reversePrintOrder = model.page.range.reversePrintOrder
+//                guard let url = self.previewView.document?.documentURL else { return }
+                guard let pdfDocument = self.previewView.document else { return }
+                
+//                if model.page.range.reversePrintOrder {
+                    // 逆序排列页面
+                    let pageCount = pdfDocument.pageCount
+                    let reversedPDFDocument = PDFDocument()
+                    for pageIndex in (0..<pageCount).reversed() {
+                        if let page = pdfDocument.page(at: pageIndex) {
+                            reversedPDFDocument.insert(page, at: reversedPDFDocument.pageCount)
+                        }
+                    }
+                    self.previewView.document = reversedPDFDocument
+//                } else {
+//                    self.previewView.document = pdfDocument
+//                }
+            }
         }
     }
 }

PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Poster/KMPrintPosterView.swift

@@ -266,7 +266,13 @@ extension KMPrintPosterView {
     }
 
     @IBAction func buttonItemClickLabels(_ sender: NSButton) {
-        self.viewModel.posterTagsAction(isSelect: cutMarksButton.state == .on, tags:[labelTextField.stringValue]) { success, model in
+        if labelButton.state == .on {
+            labelTextField.isEditable = true
+        } else {
+            labelTextField.isEditable = false
+        }
+    
+        self.viewModel.posterTagsAction(isSelect: labelButton.state == .on, tags:[labelTextField.stringValue]) { success, model in
             self.updatePDFView(isPageChange: false)
         }
     }

PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Poster/KMPrintPosterView.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" 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="22155"/>
+        <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" customClass="KMPrintPosterView" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMPrintPosterView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="columnCountText" destination="ssP-LE-KWd" id="oUd-d6-929"/>
                 <outlet property="commentsFormsComboBox" destination="yQR-GS-Lxb" id="kZ0-v4-f18"/>