【批量处理】- 右侧显示细节调整

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2235,6 +2235,9 @@
 		BB332D532995D8B500CABB58 /* KMCloudDocumentTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB332D522995D8B500CABB58 /* KMCloudDocumentTools.swift */; };
 		BB332D542995D8B500CABB58 /* KMCloudDocumentTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB332D522995D8B500CABB58 /* KMCloudDocumentTools.swift */; };
 		BB332D552995D8B500CABB58 /* KMCloudDocumentTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB332D522995D8B500CABB58 /* KMCloudDocumentTools.swift */; };
+		BB35732D2AF4F07B004CDA92 /* BatchImage.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BB35732C2AF4F07B004CDA92 /* BatchImage.xcassets */; };
+		BB35732E2AF50066004CDA92 /* KMBatchOperateConvertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6347AD2AF1F0A400F5438E /* KMBatchOperateConvertViewController.swift */; };
+		BB35732F2AF50068004CDA92 /* KMBatchOperateConvertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6347AD2AF1F0A400F5438E /* KMBatchOperateConvertViewController.swift */; };
 		BB35C49F2975362900D46EE2 /* KMRedactTopToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB35C49E2975362900D46EE2 /* KMRedactTopToolBar.swift */; };
 		BB35C4A02975362900D46EE2 /* KMRedactTopToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB35C49E2975362900D46EE2 /* KMRedactTopToolBar.swift */; };
 		BB35C4A12975362900D46EE2 /* KMRedactTopToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB35C49E2975362900D46EE2 /* KMRedactTopToolBar.swift */; };
@@ -4336,6 +4339,7 @@
 		BB31981D2AC57ACA00107371 /* CPDFPage+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFPage+PDFListView.swift"; sourceTree = "<group>"; };
 		BB32BF222A5EA05900D11348 /* KMAnalytics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAnalytics.swift; sourceTree = "<group>"; };
 		BB332D522995D8B500CABB58 /* KMCloudDocumentTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCloudDocumentTools.swift; sourceTree = "<group>"; };
+		BB35732C2AF4F07B004CDA92 /* BatchImage.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = BatchImage.xcassets; sourceTree = "<group>"; };
 		BB35C49E2975362900D46EE2 /* KMRedactTopToolBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMRedactTopToolBar.swift; sourceTree = "<group>"; };
 		BB3A81AB2AC2A4E4006FC66C /* NSTextView+KMExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+KMExtension.swift"; sourceTree = "<group>"; };
 		BB3A81AF2AC2B82A006FC66C /* KMPageSizeTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPageSizeTool.swift; sourceTree = "<group>"; };
@@ -8476,6 +8480,7 @@
 		BBF2454D2AE7725700037D08 /* resouce */ = {
 			isa = PBXGroup;
 			children = (
+				BB35732C2AF4F07B004CDA92 /* BatchImage.xcassets */,
 			);
 			path = resouce;
 			sourceTree = "<group>";
@@ -9104,6 +9109,7 @@
 				BBEC00BA295C2C1600A26C98 /* KMBatesPropertyHomeController.xib in Resources */,
 				AD1CA3FA2A05FCB60070541F /* KMAnnotationScreenViewController.xib in Resources */,
 				BBC2BCC9295DA8F30036B983 /* KMCropPreviewController.xib in Resources */,
+				BB35732D2AF4F07B004CDA92 /* BatchImage.xcassets in Resources */,
 				9FDD0F67294AB645000C4DAD /* KMMainViewController.xib in Resources */,
 				ADB2D6E9294740F30029D2B3 /* KMPrintPaperSetWindowController.xib in Resources */,
 				BBA2109029ACBFDB00E6B346 /* nosign.pdf in Resources */,
@@ -10970,6 +10976,7 @@
 				9F0CB4802967F64D00007028 /* KMPropertiesPanelReadOnlySubVC.swift in Sources */,
 				BB2EDF77296ECE17003BCF58 /* KMPageEditInsertPageSizeItemView.swift in Sources */,
 				9F1F82DB292F84D60092C4B4 /* KMHomeInsertActionViewController.swift in Sources */,
+				BB35732E2AF50066004CDA92 /* KMBatchOperateConvertViewController.swift in Sources */,
 				BB86C1EE28F544F4005AD968 /* CPDFListView+Event.m in Sources */,
 				9F1FE4A029406E4700E952CA /* HoverButton.m in Sources */,
 				BB1CA5CC298E5F540059E31C /* KMMergeTools.swift in Sources */,
@@ -11780,6 +11787,7 @@
 				ADBC17512A2991F700959CEE /* KMPurchaseManager.swift in Sources */,
 				BBC4F9FC2AEB9E200098A1A8 /* KMBatchTableCellView.swift in Sources */,
 				BB6DD823293497B6001F0544 /* KMSecureEncryptModel.swift in Sources */,
+				BB35732F2AF50068004CDA92 /* KMBatchOperateConvertViewController.swift in Sources */,
 				89D2D2E0294C451400BFF5FE /* KMThumbnailViewController.swift in Sources */,
 				ADDEEA642AD3A6E700EF675D /* KMPDFSignatureTextView.swift in Sources */,
 				9FAAA334290BD0A20046FFCE /* KMHistoryFileCollectionViewItem.swift in Sources */,

PDF Office/PDF Master/Class/Batch/View/KMBatchoperateConvertCollectionViewItem.swift

@@ -16,10 +16,14 @@ class KMBatchoperateConvertCollectionViewItem: NSCollectionViewItem{
     
     @IBOutlet var moreInfoTextField: NSTextField!
     
+    @IBOutlet var icomIV: NSImageView!
+    
+    @IBOutlet var nameTF: NSTextField!
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.textField!.font = NSFont.systemFont(ofSize: 12)
-        textField!.textColor = KMAppearance.Layout.h1Color()
+        self.nameTF!.font = NSFont.systemFont(ofSize: 12)
+        nameTF!.textColor = KMAppearance.Layout.h1Color()
         moreInfoTextField.font = NSFont.boldSystemFont(ofSize: 9)
         moreInfoTextField.textColor = KMAppearance.Layout.mColor()
         view.wantsLayer = true
@@ -113,10 +117,10 @@ class KMBatchoperateConvertCollectionViewItem: NSCollectionViewItem{
             titleString = "JPEG2000"
         }
         
-        textField?.stringValue = titleString ?? ""
+        nameTF?.stringValue = titleString ?? ""
         moreInfoTextField.stringValue = moreInfoString ?? ""
         moreInfoTextField.toolTip = moreInfoString ?? ""
-        imageView?.image = image
+        icomIV?.image = image
     }
     
 

PDF Office/PDF Master/Class/Batch/View/KMBatchoperateConvertCollectionViewItem.xib

@@ -10,9 +10,9 @@
             <connections>
                 <outlet property="advancedButton" destination="KRi-OD-0UT" id="tqY-HI-Cjh"/>
                 <outlet property="containerView" destination="GfF-v3-vvL" id="fjn-gK-zcG"/>
-                <outlet property="imageView" destination="tdp-67-GP3" id="LXw-IZ-mMZ"/>
+                <outlet property="icomIV" destination="tdp-67-GP3" id="0Kc-tg-G3i"/>
                 <outlet property="moreInfoTextField" destination="NDf-YV-Dhg" id="e9Z-jU-iNb"/>
-                <outlet property="textField" destination="g9b-M4-eEv" id="8QE-WF-qBb"/>
+                <outlet property="nameTF" destination="g9b-M4-eEv" id="7dh-Yb-Wj9"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>

PDF Office/PDF Master/Class/Batch/WindowController/Base/KMBatchOperateBaseViewController.swift

@@ -7,15 +7,15 @@
 
 import Cocoa
 
-var kBatchQueueOperationsChanged = "kBatchQueueOperationsChanged"
-
+//var kBatchQueueOperationsChanged = "kBatchQueueOperationsChanged"
+private var kBatchQueueOperationsChanged = 0x000101
 class KMBatchOperateBaseViewController: NSViewController, KMBatchOperateProtocol{
     var operateType: KMBatchOperationType?
     var convertType: KMConvertWithPDFType?
     var files: [KMBatchOperateFile]?
     lazy var queue: KMOperationQueue? = {
         var queue: KMOperationQueue?
-        if !(self.view.window as! KMBatchWindow).isBatch! {
+        if !((self.view.window as? KMBatchWindow)?.isBatch ?? false) {
             queue = KMOperationQueue()
         } else {
             if self.operateType == .Convert {
@@ -54,9 +54,9 @@ class KMBatchOperateBaseViewController: NSViewController, KMBatchOperateProtocol
     var interfaceStatus: KMBatchOperateInterfaceStatus?
     var choosePath: String = ""
     
-    init(files: NSMutableArray) {
+    init(files: [KMBatchOperateFile]) {
         super.init(nibName: String(describing: type(of: self)), bundle: nil)
-        self.files = (files as! [KMBatchOperateFile])
+        self.files = (files)
     }
     
     required init?(coder: NSCoder) {
@@ -67,7 +67,7 @@ class KMBatchOperateBaseViewController: NSViewController, KMBatchOperateProtocol
     }
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.queue!.addObserver(self, forKeyPath: "operations", options: .new, context: &kBatchQueueOperationsChanged)
+        self.queue?.addObserver(self, forKeyPath: "operations", options: .new, context: &kBatchQueueOperationsChanged)
     }
     
     func operateCompleted() {

PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateRightViewController.swift

@@ -10,7 +10,11 @@ import Cocoa
 class KMBatchOperateRightViewController: NSViewController{
     var compressViewController: KMBatchOperateCompressViewController?
     
-        var convertViewController: KMBatchOperateConvertViewController?
+      lazy var convertViewController: KMBatchOperateConvertViewController? = {
+          let vc = KMBatchOperateConvertViewController(files: self.files)
+          vc.operateType = .Convert
+          return vc
+      }()
     //    var addWatermarkViewController: KMBatchOperateAddWatermarkViewController?
     //    var removeWatermarkViewController: KMBatchOperateRemoveWatermarkViewController?
     //    var addBackgroundViewController: KMBatchOperateAddWatermarkViewController?
@@ -37,121 +41,70 @@ class KMBatchOperateRightViewController: NSViewController{
                     v.removeFromSuperview()
                 }
                 if newValue == .Convert {
-//                    self.view.addSubview(self.convertViewController!.view)
-//                    self.convertViewController!.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.convertViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.convertViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.convertViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.convertViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+                    self.view.addSubview(self.convertViewController!.view)
+                    self.convertViewController?.view.mas_makeConstraints({ make in
+                        make?.edges.equalTo()(self.view)
+                    })
                 } else if _currentType == .AddWatermark {
 //                    self.view.addSubview(self.addWatermarkViewController.view)
-//                    self.addWatermarkViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.addWatermarkViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.addWatermarkViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.addWatermarkViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.addWatermarkViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+
+//                    self.addWatermarkViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .RemoveWatermark {
 //                    self.view.addSubview(self.removeWatermarkViewController.view)
-//                    self.removeWatermarkViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.removeWatermarkViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.removeWatermarkViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.removeWatermarkViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.removeWatermarkViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.removeWatermarkViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .AddBackground {
 //                    self.view.addSubview(self.addBackgroundViewController.view)
-//                    self.addBackgroundViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.addBackgroundViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.addBackgroundViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.addBackgroundViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.addBackgroundViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.addBackgroundViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .RemoveBackground {
 //                    self.view.addSubview(self.removeBackgroundViewController.view)
-//                    self.removeBackgroundViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.removeBackgroundViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.removeBackgroundViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.removeBackgroundViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.removeBackgroundViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.removeBackgroundViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .AddHeaderFooter {
 //                    self.view.addSubview(self.addHeaderFooterViewController.view)
-//                    self.addHeaderFooterViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.addHeaderFooterViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.addHeaderFooterViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.addHeaderFooterViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.addHeaderFooterViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.addHeaderFooterViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .RemoveHeaderFooter {
 //                    self.view.addSubview(self.removeHeaderFooterViewController.view)
-//                    self.removeHeaderFooterViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.removeHeaderFooterViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.removeHeaderFooterViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.removeHeaderFooterViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.removeHeaderFooterViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.removeHeaderFooterViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .AddBates {
 //                    self.view.addSubview(self.addBatesViewController.view)
-//                    self.addBatesViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.addBatesViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.addBatesViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.addBatesViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.addBatesViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.addBatesViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .RemoveBates {
 //                    self.view.addSubview(self.removeBatesViewController.view)
-//                    self.removeBatesViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.removeBatesViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.removeBatesViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.removeBatesViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.removeBatesViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.removeBatesViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
 //                } else if _currentType == .AddPassword { self.view.addSubview(self.addPasswordViewController.view)
-//                    self.addPasswordViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.addPasswordViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.addPasswordViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.addPasswordViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.addPasswordViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.addPasswordViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .RemovePassword {
 //                    self.view.addSubview(self.removePasswordViewController.view)
-//                    self.removePasswordViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.removePasswordViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.removePasswordViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.removePasswordViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.removePasswordViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.removePasswordViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .Compress {
 //                    self.view.addSubview(self.compressViewController.view)
-//                    self.compressViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.compressViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.compressViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.compressViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.compressViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.compressViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 } else if _currentType == .CreatePDF {
 //                    self.view.addSubview(self.imageToPDFViewController.view)
-//                    self.imageToPDFViewController.view.translatesAutoresizingMaskIntoConstraints = false
-//                    NSLayoutConstraint.activate([
-//                        self.imageToPDFViewController!.view.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-//                        self.imageToPDFViewController!.view.topAnchor.constraint(equalTo: self.view.topAnchor),
-//                        self.imageToPDFViewController!.view.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-//                        self.imageToPDFViewController!.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
-//                    ])
+//                    self.imageToPDFViewController?.view.mas_makeConstraints({ make in
+//                        make?.edges.equalTo()(self.view)
+//                    })
                 }
             }
         }

PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift

@@ -18,8 +18,8 @@ class KMDetailInfoView: NSView{
     }
 }
 
-class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController{
-    var dataSourcesArray: NSMutableArray?
+class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController,NSCollectionViewDelegate,NSCollectionViewDataSource{
+    var dataSourcesArray: [KMConvertWithPDFType]?
     @IBOutlet var collectionView: NSCollectionView!
     @IBOutlet var bottomView: NSView!
     @IBOutlet var convertEveryPageButton: NSButton!
@@ -284,6 +284,7 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController{
         convertEveryPageButtonLabel.stringValue = NSLocalizedString("Convert each page to a separate worksheet", comment: "")
         
         self.collectionView.register(KMConvertCollectionViewHeader.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMAdvertisementCollectionViewItem"))
+        self.collectionView.register(KMBatchoperateConvertCollectionViewItem.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMBatchoperateConvertCollectionViewItem"))
         
         collectionView.enclosingScrollView?.drawsBackground = false
         let v = NSView(frame: NSRect(x: 0, y: 0, width: 100, height: 100))
@@ -385,7 +386,7 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController{
     }
     func prepareData() {
         let arr: [KMConvertWithPDFType] = [.Excel, .PowerPoint, .RTF, .CSV, .CSV, .HTML, .Text, .JPEG, .JPG, .PNG, .GIF, .TIFF, .TGA, .BMP, .JPEG2000]
-        self.dataSourcesArray = NSMutableArray(array: arr)
+        self.dataSourcesArray = arr
         
         var needShowAdvance = true
         var needShowDefault = true
@@ -519,25 +520,23 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController{
     }
     func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
         let item = collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMBatchoperateConvertCollectionViewItem"), for: indexPath) as! KMBatchoperateConvertCollectionViewItem
-        let number = dataSourcesArray![indexPath.item]
-        item.updateInterface(KMConvertWithPDFType(rawValue: (number as AnyObject).intValue!) ?? .WordAdvance)
+        item.updateInterface(dataSourcesArray![indexPath.item])
         return item
     }
     func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> NSSize {
-        return NSSize(width: 74, height: 80)
+        return NSSize(width: 74, height: 180)
     }
     func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, insetForSectionAt section: Int) -> NSEdgeInsets {
         return NSEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
     }
     func collectionView(_ collectionView: NSCollectionView, didSelectItemsAt indexPaths: Set<IndexPath>) {
         if let indexPath = indexPaths.first {
-            let number = dataSourcesArray![indexPath.item]
-            convertType = intConvertType(num: number as! Int)
+            convertType = dataSourcesArray![indexPath.item]
             updateBottomView()
         }
     }
     func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> NSSize {
-        return NSSize(width: 10000, height: 50)
+        return NSSize(width: 10000, height: 100)
     }
     func collectionView(_ collectionView: NSCollectionView, viewForSupplementaryElementOfKind kind: NSCollectionView.SupplementaryElementKind, at indexPath: IndexPath) -> NSView {
         let view = collectionView.makeSupplementaryView(ofKind: kind, withIdentifier:NSUserInterfaceItemIdentifier(rawValue: "convertHeader") , for: indexPath) as! KMConvertCollectionViewHeader

PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.xib

@@ -13,10 +13,10 @@
                 <outlet property="allContentMenu2" destination="DQt-vJ-kuC" id="z3L-H4-EO3"/>
                 <outlet property="allContentMenu3" destination="dL3-9i-sD9" id="Wnw-gR-kAB"/>
                 <outlet property="bottomView" destination="RWh-gu-eYa" id="KeF-AW-TCH"/>
-                <outlet property="checkBoxBottomConstaint" destination="XFY-dJ-slt" id="DlC-VO-NW6"/>
-                <outlet property="checkBoxTopConstraint" destination="vFy-Pl-PGa" id="jGT-n1-OsJ"/>
+                <outlet property="checkBoxBottomConstaint" destination="XFY-dJ-slt" id="mOO-HD-MIJ"/>
+                <outlet property="checkBoxTopConstraint" destination="vFy-Pl-PGa" id="Rg7-9b-hTm"/>
                 <outlet property="collectionView" destination="rs6-48-Ybe" id="YwP-ad-igf"/>
-                <outlet property="containerViewTopConstraint" destination="Puy-3b-upI" id="Ri0-DO-yQ2"/>
+                <outlet property="containerViewTopConstraint" destination="Puy-3b-upI" id="eqV-a1-vXh"/>
                 <outlet property="convertButton" destination="x4l-h4-1bj" id="DJs-wX-FIh"/>
                 <outlet property="convertEveryPageButton" destination="SlC-Ho-TLc" id="gjs-Tl-fkQ"/>
                 <outlet property="convertEveryPageButtonLabel" destination="fgA-rp-Vm7" id="ELW-UZ-I8Z"/>
@@ -93,7 +93,7 @@
                                 <action selector="buttonClicked_Convert:" target="-2" id="Lwc-MC-9me"/>
                             </connections>
                         </button>
-                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="0aW-6P-3ho" customClass="KMDetailInfoView">
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="0aW-6P-3ho" customClass="KMDetailInfoView" customModule="PDF_Master" customModuleProvider="target">
                             <rect key="frame" x="16" y="128" width="477" height="16"/>
                             <subviews>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="71Q-Bc-2Mg">

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileBMP.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_bmp-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_bmp.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileCSV.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_csv.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_csv-1.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileElse.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_rtf-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_rtf.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileExcel.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_excel-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_excel.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileGIF.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_gif-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_gif.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileHTML.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_html-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_html.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileJP2.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_jp2-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_jp2.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileJPEG.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_jpeg-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_jpeg.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileJPG.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_jpg-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_jpg.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFilePNG.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_png.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_png-1.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFilePPT.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_ppt-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_ppt.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFilePdf.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_pdf-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_pdf.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileTGA.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_tga-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_tga.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileTIFF.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_tiff-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_tiff.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileTXT.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_txt-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_txt.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Batch/resouce/BatchImage.xcassets/ic_Propertybar/KMImageNameUXIconPropertybarFileWord.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_propertybar_file_word-1.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_propertybar_file_word.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}