Browse Source

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

niehaoyu 2 months ago
parent
commit
831ec71144
86 changed files with 679 additions and 5306 deletions
  1. 0 12
      PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController+Action.swift
  2. 30 9
      PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift
  3. 84 59
      PDF Office/PDF Master/KMClass/NewBatch/KMBatchWindowController.swift
  4. 47 22
      PDF Office/PDF Master/KMClass/NewBatch/KMBatchWindowController.xib
  5. 22 0
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_OCR.imageset/Contents.json
  6. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_OCR.imageset/base-placeholder.pdf
  7. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_OCR.imageset/ic.pdf
  8. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_false.imageset/Contents.json
  9. 0 184
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_false.imageset/Select=false-4.pdf
  10. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_false.imageset/background 1.pdf
  11. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_false.imageset/background.pdf
  12. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_true.imageset/Contents.json
  13. 0 184
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_true.imageset/Select=true-4.pdf
  14. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_false.imageset/Contents.json
  15. 0 191
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_false.imageset/Select=false-6.pdf
  16. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_false.imageset/base-placeholder.pdf
  17. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_false.imageset/bates.pdf
  18. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_true.imageset/Contents.json
  19. 0 191
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_true.imageset/Select=true-6.pdf
  20. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_false.imageset/Contents.json
  21. 0 182
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_false.imageset/Select=false-1.pdf
  22. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_false.imageset/compress 1.pdf
  23. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_false.imageset/compress.pdf
  24. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_true.imageset/Contents.json
  25. 0 182
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_true.imageset/Select=true-1.pdf
  26. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_false.imageset/Contents.json
  27. 0 115
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_false.imageset/Select=false.pdf
  28. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_false.imageset/base-placeholder.pdf
  29. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_false.imageset/word.pdf
  30. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_true.imageset/Contents.json
  31. 0 115
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_true.imageset/Select=true.pdf
  32. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_false.imageset/Contents.json
  33. 0 103
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_false.imageset/Select=false-5.pdf
  34. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_false.imageset/base-placeholder.pdf
  35. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_false.imageset/header&footer.pdf
  36. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_true.imageset/Contents.json
  37. 0 103
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_true.imageset/Select=true-5.pdf
  38. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_false.imageset/Contents.json
  39. 0 97
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_false.imageset/Select=false-7.pdf
  40. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_false.imageset/base-placeholder.pdf
  41. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_false.imageset/delete.pdf
  42. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_true.imageset/Contents.json
  43. 0 97
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_true.imageset/Select=true-7.pdf
  44. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_false.imageset/Contents.json
  45. 0 1237
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_false.imageset/Select=false-2.pdf
  46. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_false.imageset/ic.pdf
  47. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_false.imageset/security.pdf
  48. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_true.imageset/Contents.json
  49. 0 1237
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_true.imageset/Select=true-2.pdf
  50. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_false.imageset/Contents.json
  51. 0 117
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_false.imageset/Select=false-3.pdf
  52. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_false.imageset/base-placeholder.pdf
  53. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_false.imageset/watermark.pdf
  54. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_true.imageset/Contents.json
  55. 0 117
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_true.imageset/Select=true-3.pdf
  56. 10 9
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_false.imageset/Contents.json
  57. 0 95
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_false.imageset/Disabled=false, State=norm.pdf
  58. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_false.imageset/icon_prefix.pdf
  59. BIN
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_false.imageset/trash.pdf
  60. 0 21
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_true.imageset/Contents.json
  61. 0 95
      PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_true.imageset/Disabled=true, State=norm.pdf
  62. 5 1
      PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/KMBatchCollectionView.swift
  63. 6 6
      PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/KMBatchCollectionView.xib
  64. 8 4
      PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/Model/KMBatchCollectionViewModel.swift
  65. 17 13
      PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/Presenter/KMBatchCollectionViewPrensenter.swift
  66. 18 16
      PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/View/KMBatchCollectionViewItem.swift
  67. 8 34
      PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/View/KMBatchCollectionViewItem.xib
  68. 3 2
      PDF Office/PDF Master/KMClass/NewBatch/View/Choose/KMBatchSettingView.swift
  69. 8 57
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/KMBatchProcessingView.swift
  70. 15 61
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/KMBatchProcessingView.xib
  71. 3 3
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/SelectedFiles/KMBatchSelectedFilesView.swift
  72. 11 10
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/SelectedFiles/KMBatchSelectedFilesView.xib
  73. 31 18
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableView.swift
  74. 15 14
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableView.xib
  75. 7 6
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableViewModel/KMBatchProcessingTableViewModel.swift
  76. 4 3
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingColumnHeaderCell.swift
  77. 7 7
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingDeleteTableCell.xib
  78. 4 4
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNameTableCell.xib
  79. 59 0
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNumTableCell.swift
  80. 22 0
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNumTableCell.xib
  81. 4 4
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingOrderTableCell.xib
  82. 4 4
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingSizeTableCell.xib
  83. 3 3
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingStateTableCell.xib
  84. 11 10
      PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingTableRowView.swift
  85. 28 12
      PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj
  86. 105 0
      PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+ 0 - 12
PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController+Action.swift

@@ -849,18 +849,6 @@ extension KMMainViewController {
         }
     }
      
-    func showBatchWindow(type: KMBatchOperationType, filepaths: [String]?) {
-        let batchWindowController = KMBatchOperateWindowController.sharedWindowController
-        
-        var array: [KMBatchOperateFile] = []
-        for fpath in filepaths ?? [] {
-            let batchOperateFile = KMBatchOperateFile(filePath: fpath, type: type)
-            array.append(batchOperateFile)
-        }
-        batchWindowController.switchToOperateType(type, files: array)
-        batchWindowController.window?.makeKeyAndOrderFront("")
-    }
-     
     func openNewWindowAlertWindow() {
         var needShowChooseWindow = false
         //#if VERSION_FREE

+ 30 - 9
PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -3233,7 +3233,7 @@ extension KMMainViewController {
         
         self.compressWindowController?.batchAction = { [unowned self] view, filePaths in
             self.view.window?.endSheet((self.compressWindowController?.window)!)
-            self.showBatchCompressController(filePaths)
+            self.showBatchWindow(type: .compress, files: filePaths)
         }
         
         self.compressWindowController?.resultCallback = { [unowned self] result, openDocument, fileURL, error in
@@ -3252,13 +3252,6 @@ extension KMMainViewController {
             }
         }
     }
-    
-    func showBatchCompressController(_ filePaths: [URL]) {
-        let batchWindowController = KMBatchOperateWindowController.sharedWindowController
-        let batchOperateFile = KMBatchOperateFile(filePath: filePaths.first!.path, type: .Compress)
-        batchWindowController.switchToOperateType(KMBatchOperationType.Compress, files: [batchOperateFile])
-        batchWindowController.window?.makeKeyAndOrderFront("")
-    }
 }
 
 //MARK: - OCR
@@ -3403,6 +3396,32 @@ extension KMMainViewController {
     }
 }
 
+//Batch
+extension KMMainViewController {
+    func showBatchWindow(type: KMBatchCollectionViewType, files: [URL]?) {
+        let batchWindowController = KMBatchWindowController.init(windowNibName: "KMBatchWindowController")
+        batchWindowController.window?.makeKeyAndOrderFront("")
+        
+        var datas: [KMBatchProcessingTableViewModel] = []
+        for file in files! {
+            let data = KMBatchProcessingTableViewModel.initWithFilePath(url: file)
+            datas.append(data)
+        }
+        batchWindowController.batchData = datas
+        batchWindowController.type = type
+        
+//        let batchWindowController = KMBatchOperateWindowController.sharedWindowController
+//        
+//        var array: [KMBatchOperateFile] = []
+//        for fpath in filepaths ?? [] {
+//            let batchOperateFile = KMBatchOperateFile(filePath: fpath, type: type)
+//            array.append(batchOperateFile)
+//        }
+//        batchWindowController.switchToOperateType(type, files: array)
+//        batchWindowController.window?.makeKeyAndOrderFront("")
+    }
+}
+
 //MARK: - 代理方法
 //MARK: - NSSplitViewDelegate
 extension KMMainViewController: NSSplitViewDelegate {
@@ -3776,7 +3795,7 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
                 self.showCompressController(self.listView.document.documentURL)
                 
             } else if itemIdentifier == KMPDFToolbar_tools_batch_compress_Identifier {
-                self.showBatchCompressController([self.listView.document.documentURL])
+                self.showBatchWindow(type: .compress, files: [self.listView.document.documentURL])
                 
             } else if itemIdentifier == KMPDFToolbar_tools_OCR_Identifier {
                 viewManager.showRightSide = !viewManager.showRightSide
@@ -3801,6 +3820,8 @@ extension KMMainViewController: KMPDFToolbarControllerDelegate {
                 self.beginCompareAction(1)
             } else if itemIdentifier == KMPDFToolbar_tools_compare_Overlay_Identifier {
                 self.beginCompareAction(2)
+            } else if itemIdentifier == KMPDFToolbar_tools_batch_Identifier {
+                self.showBatchWindow(type: .convertPDF, files: [])
             }
         } else if itemIdentifier == KMPDFToolbar_ViewDisplay_Identifier {
             //MARK: -Display

+ 84 - 59
PDF Office/PDF Master/KMClass/NewBatch/KMBatchWindowController.swift

@@ -6,6 +6,40 @@
 //
 
 import Cocoa
+import KMComponentLibrary
+
+class CustomWindowController: NSWindowController {
+    override func windowDidLoad() {
+        super.windowDidLoad()
+        
+        // 创建一个工具栏
+        let toolbar = NSToolbar(identifier: "CustomToolbar")
+        toolbar.delegate = self
+        toolbar.allowsUserCustomization = false
+        toolbar.displayMode = .iconAndLabel
+
+        // 设置窗口的工具栏
+        self.window?.toolbar = toolbar
+    }
+}
+
+extension CustomWindowController: NSToolbarDelegate {
+    func toolbar(_ toolbar: NSToolbar, itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier, willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
+        let item = NSToolbarItem(itemIdentifier: itemIdentifier)
+        item.label = "Action"
+        item.target = self
+        item.action = #selector(toolbarAction)
+        return item
+    }
+
+    func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
+        return [.flexibleSpace, NSToolbarItem.Identifier("CustomItem")]
+    }
+
+    @objc func toolbarAction() {
+        print("Toolbar action triggered!")
+    }
+}
 
 class KMBatchWindowController: NSWindowController {
 
@@ -13,34 +47,13 @@ class KMBatchWindowController: NSWindowController {
     @IBOutlet weak var batchCollectionView: KMBatchCollectionView!
     @IBOutlet weak var batchHandleView: NSView!
     @IBOutlet weak var settingView: KMBatchSettingView!
-    @IBOutlet weak var titleLabel: NSTextField!
+    @IBOutlet weak var processView: NSView!
+    
+    @IBOutlet weak var addFilesButton: ComponentDropdownTool!
+    @IBOutlet weak var deleteButton: ComponentButton!
     
-    var batchData: [KMBatchProcessingTableViewModel]?
-    var inputType: DataNavigationViewButtonActionType? {
-        didSet {
-            var type: KMBatchCollectionViewType = .convertPDF
-            switch inputType {
-            case .BatchRemove:
-                type = .batchRemove
-            case .Background:
-                type = .background
-            case .Watermark:
-                type = .watermark
-            case .Compression:
-                type = .compress
-            case .Security:
-                type = .security
-            case.HeaderAndFooter:
-                type = .headerAndFooter
-            case .BatesCode:
-                type = .batesNumber
-            default:
-                type = .convertPDF
-            }
-            self.type = type
-        }
-    }
     
+    var batchData: [KMBatchProcessingTableViewModel]?
     var inputSubType: Any?
     
     var type: KMBatchCollectionViewType = .convertPDF {
@@ -56,8 +69,29 @@ class KMBatchWindowController: NSWindowController {
     override func windowDidLoad() {
         super.windowDidLoad()
 
-        // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
-        self.window?.title = NSLocalizedString("Batch", comment: "")
+        guard let window = self.window else { return }
+                
+        // 隐藏标题栏
+        window.titleVisibility = .hidden
+        window.titlebarAppearsTransparent = true
+        
+//        // 添加自定义导航栏
+//        let navBar = NSView(frame: NSRect(x: 0, y: window.frame.height - 10, width: window.frame.width, height: 10))
+//        navBar.wantsLayer = true
+//        navBar.layer?.backgroundColor = ComponentLibrary.shared.backgroundColor(forToken: "colorBg/layout-middle")?.cgColor // 自定义颜色
+//        
+//        // 添加到窗口内容视图中
+//        window.contentView?.addSubview(navBar)
+//        
+//        // 添加约束
+//        navBar.translatesAutoresizingMaskIntoConstraints = false
+//        NSLayoutConstraint.activate([
+//            navBar.topAnchor.constraint(equalTo: window.contentView!.topAnchor),
+//            navBar.leadingAnchor.constraint(equalTo: window.contentView!.leadingAnchor),
+//            navBar.trailingAnchor.constraint(equalTo: window.contentView!.trailingAnchor),
+//            navBar.heightAnchor.constraint(equalToConstant: 10)
+//        ])
+
         self.setup()
         self.reloadData()
     }
@@ -65,19 +99,32 @@ class KMBatchWindowController: NSWindowController {
     
     func setup() {
         self.window?.contentView?.wantsLayer = true
-        self.window?.contentView?.layer?.backgroundColor = NSColor.white.cgColor
+        self.window?.contentView?.layer?.backgroundColor = ComponentLibrary.shared.backgroundColor(forToken: "colorBg/layout-middle")?.cgColor
+        // 修改窗口背景颜色
+        self.window?.backgroundColor = ComponentLibrary.shared.backgroundColor(forToken: "colorBg/layout-middle")
         
-        self.titleLabel.font = NSFont.SFProTextRegularFont(16.0)
-        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
+        self.processView.wantsLayer = true
+        self.processView.border(ComponentLibrary.shared.getComponentColorFromKey("colorBorder/divider"), 0.5)
         
         self.batchCollectionView.delegate = self
         self.batchPrecessingView.delegate = self
         
         self.settingView.type = .convertPDF
+        
+        self.addFilesButton.properties = ComponentDropdownToolProperty(state: .normal, text: KMLocalizedString("Add Files..."), showDropdown: true, arrowIcon: NSImage(named: "toolbar_arrowDown_fill"))
+        self.addFilesButton.reloadData()
+        
+        self.deleteButton.properties = ComponentButtonProperty(type: .default_tertiary,
+                                                               size: .s,
+                                                               state: .normal,
+                                                               onlyIcon: true,
+                                                               icon:NSImage(named: "icon_btn_clear_norm_false"),
+                                                               keepPressState: false)
+        self.deleteButton.reloadData()
     }
     
     func reloadData() {
-        self.batchPrecessingView.inputType = self.inputType
+        self.batchPrecessingView.inputType = self.type
         self.batchCollectionView.inputType = self.type
         self.settingView.type = self.type
         self.settingView.subType = self.inputSubType
@@ -88,7 +135,6 @@ class KMBatchWindowController: NSWindowController {
         if KMBatchWindowController.isSampleController() {
             KMPrint("存在相同文件")
             if let controller: KMBatchWindowController = self.fetchSampleController() {
-                controller.inputType = .Batch
                 controller.showWindow(window)
             }
         } else {
@@ -103,19 +149,18 @@ class KMBatchWindowController: NSWindowController {
                     let batchWindowController: KMBatchWindowController = KMBatchWindowController.init(windowNibName: "KMBatchWindowController")
                     batchWindowController.showWindow(window)
                     batchWindowController.batchPrecessingView.inputData = data
-                    batchWindowController.inputType = .Batch
                 }
             }
         }
     }
     
     //MARK: 打开文件
-    static func openFile(_ url: URL?, _ type: DataNavigationViewButtonActionType, _ subType: Any = "") {
+    static func openFile(_ url: URL?, _ type: KMBatchCollectionViewType, _ subType: Any = "") {
         if KMBatchWindowController.isSampleController() {
             if let controller: KMBatchWindowController = self.fetchSampleController() {
                 KMPrint("存在相同文件")
                 controller.inputSubType = subType
-                controller.inputType = type
+                controller.type = type
                 controller.showWindow(NSApp.mainWindow)
             }
         } else {
@@ -126,7 +171,7 @@ class KMBatchWindowController: NSWindowController {
             }
             
             batchWindowController.inputSubType = subType
-            batchWindowController.inputType = type
+            batchWindowController.type = type
         }
     }
     
@@ -144,7 +189,7 @@ class KMBatchWindowController: NSWindowController {
         for window in NSApp.windows {
             let controller = window.windowController
             if controller is KMBatchWindowController {
-                return controller as! KMBatchWindowController
+                return controller as? KMBatchWindowController
             }
         }
         
@@ -164,26 +209,6 @@ extension KMBatchWindowController: KMBatchCollectionViewDelegate {
         KMPrint(data.type.rawValue)
         let dataType: KMBatchCollectionViewType = data.type
         self.settingView.type = dataType
-        
-        var type: DataNavigationViewButtonActionType = self.inputType ?? .ConvertPDF
-        switch dataType {
-        case .batchRemove:
-            type = .BatchRemove
-        case .background:
-            type = .Background
-        case .watermark:
-            type = .Watermark
-        case .compress:
-            type = .Compression
-        case .security:
-            type = .Security
-        case.headerAndFooter:
-            type = .HeaderAndFooter
-        case .batesNumber:
-            type = .BatesCode
-        default:
-            type = .ConvertPDF
-        }
-        self.batchPrecessingView.inputType = type
+        self.batchPrecessingView.inputType = dataType
     }
 }

+ 47 - 22
PDF Office/PDF Master/KMClass/NewBatch/KMBatchWindowController.xib

@@ -8,11 +8,13 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMBatchWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
+                <outlet property="addFilesButton" destination="xL9-Ss-nHe" id="dY7-3F-MIV"/>
                 <outlet property="batchCollectionView" destination="NpS-mf-MjM" id="2Cn-9G-deg"/>
                 <outlet property="batchHandleView" destination="gb1-Aa-tbK" id="F8k-Ha-0pb"/>
                 <outlet property="batchPrecessingView" destination="Quv-tZ-EYd" id="mU2-SE-yX7"/>
+                <outlet property="deleteButton" destination="Xbx-iI-2wR" id="iFR-BN-UQP"/>
+                <outlet property="processView" destination="gH5-eQ-PMm" id="Gv5-YC-WCR"/>
                 <outlet property="settingView" destination="DNN-jM-3Lh" id="cmU-9D-7sd"/>
-                <outlet property="titleLabel" destination="xVD-EG-S9x" id="3fh-eH-TeT"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
@@ -21,27 +23,28 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="1014" height="559"/>
+            <rect key="contentRect" x="912" y="400" width="1080" height="600"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <value key="minSize" type="size" width="1080" height="600"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="1014" height="559"/>
+                <rect key="frame" x="0.0" y="0.0" width="1080" height="600"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="NpS-mf-MjM" customClass="KMBatchCollectionView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="206" height="559"/>
+                        <rect key="frame" x="0.0" y="0.0" width="240" height="600"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="206" id="Ar4-ka-nDh"/>
+                            <constraint firstAttribute="width" constant="240" id="Ar4-ka-nDh"/>
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="gb1-Aa-tbK">
-                        <rect key="frame" x="754" y="0.0" width="260" height="559"/>
+                        <rect key="frame" x="816" y="0.0" width="264" height="600"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="DNN-jM-3Lh" customClass="KMBatchSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="260" height="559"/>
+                                <rect key="frame" x="0.0" y="0.0" width="264" height="600"/>
                             </customView>
                         </subviews>
                         <constraints>
-                            <constraint firstAttribute="width" constant="260" id="8VA-Va-3Ig"/>
+                            <constraint firstAttribute="width" constant="264" id="8VA-Va-3Ig"/>
                             <constraint firstItem="DNN-jM-3Lh" firstAttribute="leading" secondItem="gb1-Aa-tbK" secondAttribute="leading" id="Tu9-I3-iga"/>
                             <constraint firstAttribute="bottom" secondItem="DNN-jM-3Lh" secondAttribute="bottom" id="a21-dC-rM5"/>
                             <constraint firstAttribute="trailing" secondItem="DNN-jM-3Lh" secondAttribute="trailing" id="fyz-Ts-N4p"/>
@@ -49,26 +52,46 @@
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="gH5-eQ-PMm">
-                        <rect key="frame" x="206" y="0.0" width="548" height="559"/>
+                        <rect key="frame" x="240" y="0.0" width="576" height="600"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Quv-tZ-EYd" customClass="KMBatchProcessingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="548" height="509"/>
+                                <rect key="frame" x="0.0" y="0.0" width="576" height="538"/>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="mFD-ha-HSU">
-                                <rect key="frame" x="0.0" y="509" width="548" height="50"/>
+                                <rect key="frame" x="0.0" y="538" width="576" height="62"/>
                                 <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xVD-EG-S9x">
-                                        <rect key="frame" x="14" y="16" width="96" height="19"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Convert PDF" id="KrB-84-Qgx">
-                                            <font key="font" metaFont="system" size="16"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
+                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="pG5-aO-KP9">
+                                        <rect key="frame" x="24" y="0.0" width="528" height="54"/>
+                                        <subviews>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="xL9-Ss-nHe" customClass="ComponentDropdownTool" customModule="KMComponentLibrary">
+                                                <rect key="frame" x="0.0" y="11" width="129" height="32"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="129" id="br7-Iz-PPQ"/>
+                                                    <constraint firstAttribute="height" constant="32" id="whc-Wy-hqv"/>
+                                                </constraints>
+                                            </customView>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Xbx-iI-2wR" customClass="ComponentButton" customModule="KMComponentLibrary">
+                                                <rect key="frame" x="496" y="11" width="32" height="32"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="32" id="dwZ-9S-dJM"/>
+                                                    <constraint firstAttribute="width" constant="32" id="nvo-i3-fYx"/>
+                                                </constraints>
+                                            </customView>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstItem="Xbx-iI-2wR" firstAttribute="centerY" secondItem="pG5-aO-KP9" secondAttribute="centerY" id="H4d-HG-zGv"/>
+                                            <constraint firstItem="xL9-Ss-nHe" firstAttribute="leading" secondItem="pG5-aO-KP9" secondAttribute="leading" id="Q9H-Pw-7kz"/>
+                                            <constraint firstItem="xL9-Ss-nHe" firstAttribute="centerY" secondItem="pG5-aO-KP9" secondAttribute="centerY" id="cHU-VX-a5B"/>
+                                            <constraint firstAttribute="trailing" secondItem="Xbx-iI-2wR" secondAttribute="trailing" id="s8T-fn-GwN"/>
+                                        </constraints>
+                                    </customView>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstItem="xVD-EG-S9x" firstAttribute="leading" secondItem="mFD-ha-HSU" secondAttribute="leading" constant="16" id="Q85-QJ-QqY"/>
-                                    <constraint firstItem="xVD-EG-S9x" firstAttribute="centerY" secondItem="mFD-ha-HSU" secondAttribute="centerY" id="SEk-KJ-ItS"/>
+                                    <constraint firstAttribute="height" constant="62" id="4b7-i3-nUn"/>
+                                    <constraint firstItem="pG5-aO-KP9" firstAttribute="top" secondItem="mFD-ha-HSU" secondAttribute="top" constant="8" id="8Ed-cj-u2e"/>
+                                    <constraint firstAttribute="trailing" secondItem="pG5-aO-KP9" secondAttribute="trailing" constant="24" id="P9P-ra-zFu"/>
+                                    <constraint firstAttribute="bottom" secondItem="pG5-aO-KP9" secondAttribute="bottom" id="WBk-Vo-xDW"/>
+                                    <constraint firstItem="pG5-aO-KP9" firstAttribute="leading" secondItem="mFD-ha-HSU" secondAttribute="leading" constant="24" id="ZqZ-zs-B8N"/>
                                 </constraints>
                             </customView>
                         </subviews>
@@ -77,10 +100,12 @@
                             <constraint firstAttribute="trailing" secondItem="mFD-ha-HSU" secondAttribute="trailing" id="CLD-8X-OO6"/>
                             <constraint firstItem="Quv-tZ-EYd" firstAttribute="top" secondItem="mFD-ha-HSU" secondAttribute="bottom" id="Mge-H9-gwb"/>
                             <constraint firstItem="Quv-tZ-EYd" firstAttribute="leading" secondItem="gH5-eQ-PMm" secondAttribute="leading" id="QIT-5k-dc3"/>
+                            <constraint firstItem="mFD-ha-HSU" firstAttribute="top" secondItem="gH5-eQ-PMm" secondAttribute="top" id="TGE-VV-vqU"/>
+                            <constraint firstItem="mFD-ha-HSU" firstAttribute="leading" secondItem="gH5-eQ-PMm" secondAttribute="leading" id="eWW-eh-oTz"/>
                             <constraint firstAttribute="bottom" secondItem="Quv-tZ-EYd" secondAttribute="bottom" id="egJ-td-GWL"/>
+                            <constraint firstAttribute="trailing" secondItem="mFD-ha-HSU" secondAttribute="trailing" id="eyp-vi-3bM"/>
                             <constraint firstItem="mFD-ha-HSU" firstAttribute="top" secondItem="gH5-eQ-PMm" secondAttribute="top" id="gfg-6Z-Pcg"/>
                             <constraint firstItem="mFD-ha-HSU" firstAttribute="leading" secondItem="gH5-eQ-PMm" secondAttribute="leading" id="qD8-cm-0x8"/>
-                            <constraint firstItem="Quv-tZ-EYd" firstAttribute="top" secondItem="gH5-eQ-PMm" secondAttribute="top" constant="50" id="rhu-u5-ci5"/>
                         </constraints>
                     </customView>
                 </subviews>

+ 22 - 0
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_OCR.imageset/Contents.json

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

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_OCR.imageset/base-placeholder.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_OCR.imageset/ic.pdf


+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Select=false-4.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "background.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "background 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 0 - 184
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_false.imageset/Select=false-4.pdf

@@ -1,184 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << /Type /XObject
-     /Length 2 0 R
-     /Group << /Type /Group
-               /S /Transparency
-            >>
-     /Subtype /Form
-     /Resources << >>
-     /BBox [ 0.000000 0.000000 20.000000 20.000000 ]
-  >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 -0.678223 -0.802765 cm
-0.380392 0.392157 0.411765 scn
-1.414213 8.485291 m
-12.727921 19.799000 l
-11.313708 21.213213 l
-0.000000 9.899505 l
-1.414213 8.485291 l
-h
-4.242582 5.656861 m
-15.556291 16.970570 l
-14.142077 18.384783 l
-2.828369 7.071074 l
-4.242582 5.656861 l
-h
-18.384661 14.142139 m
-7.070951 2.828430 l
-5.656738 4.242645 l
-16.970446 15.556353 l
-18.384661 14.142139 l
-h
-9.899321 0.000000 m
-21.213030 11.313709 l
-19.798815 12.727922 l
-8.485107 1.414215 l
-9.899321 0.000000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-2 0 obj
-  554
-endobj
-
-3 0 obj
-  << /Type /XObject
-     /Length 4 0 R
-     /Group << /Type /Group
-               /S /Transparency
-            >>
-     /Subtype /Form
-     /Resources << >>
-     /BBox [ 0.000000 0.000000 20.000000 20.000000 ]
-  >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 5.000000 3.000000 cm
-0.380392 0.392157 0.411765 scn
-0.000000 14.000000 m
-6.333253 14.000000 l
-10.000000 9.800000 l
-10.000000 0.000000 l
-0.000000 0.000000 l
-0.000000 14.000000 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-4 0 obj
-  252
-endobj
-
-5 0 obj
-  << /XObject << /X1 1 0 R >>
-     /ExtGState << /E1 << /SMask << /Type /Mask
-                                    /G 3 0 R
-                                    /S /Alpha
-                                 >>
-                          /Type /ExtGState
-                       >> >>
-  >>
-endobj
-
-6 0 obj
-  << /Length 7 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.380392 0.392157 0.411765 scn
-2.000000 2.000000 m
-14.000000 2.000000 l
-14.000000 13.251528 l
-9.867070 18.000000 l
-2.000000 18.000000 l
-2.000000 2.000000 l
-h
-2.000000 20.000000 m
-0.895431 20.000000 0.000000 19.104568 0.000000 18.000000 c
-0.000000 2.000000 l
-0.000000 0.895430 0.895431 0.000000 2.000000 0.000000 c
-14.000000 0.000000 l
-15.104569 0.000000 16.000000 0.895430 16.000000 2.000000 c
-16.000000 13.251528 l
-16.000000 13.734164 15.825472 14.200521 15.508610 14.564576 c
-11.375679 19.313049 l
-10.995841 19.749458 10.445629 20.000000 9.867069 20.000000 c
-2.000000 20.000000 l
-h
-f*
-n
-Q
-q
-/E1 gs
-/X1 Do
-Q
-
-endstream
-endobj
-
-7 0 obj
-  698
-endobj
-
-8 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 5 0 R
-     /Contents 6 0 R
-     /Parent 9 0 R
-  >>
-endobj
-
-9 0 obj
-  << /Kids [ 8 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-10 0 obj
-  << /Pages 9 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 11
-0000000000 65535 f
-0000000010 00000 n
-0000000812 00000 n
-0000000834 00000 n
-0000001334 00000 n
-0000001356 00000 n
-0000001654 00000 n
-0000002408 00000 n
-0000002430 00000 n
-0000002603 00000 n
-0000002677 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 10 0 R
-   /Size 11
->>
-startxref
-2737
-%%EOF

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_false.imageset/background 1.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_false.imageset/background.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Select=true-4.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 184
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_background_true.imageset/Select=true-4.pdf

@@ -1,184 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << /Type /XObject
-     /Length 2 0 R
-     /Group << /Type /Group
-               /S /Transparency
-            >>
-     /Subtype /Form
-     /Resources << >>
-     /BBox [ 0.000000 0.000000 20.000000 20.000000 ]
-  >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 -0.678223 -0.802765 cm
-0.090196 0.439216 0.956863 scn
-1.414213 8.485291 m
-12.727921 19.799000 l
-11.313708 21.213213 l
-0.000000 9.899505 l
-1.414213 8.485291 l
-h
-4.242582 5.656861 m
-15.556291 16.970570 l
-14.142077 18.384783 l
-2.828369 7.071074 l
-4.242582 5.656861 l
-h
-18.384661 14.142139 m
-7.070951 2.828430 l
-5.656738 4.242645 l
-16.970446 15.556353 l
-18.384661 14.142139 l
-h
-9.899321 0.000000 m
-21.213030 11.313709 l
-19.798815 12.727922 l
-8.485107 1.414215 l
-9.899321 0.000000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-2 0 obj
-  554
-endobj
-
-3 0 obj
-  << /Type /XObject
-     /Length 4 0 R
-     /Group << /Type /Group
-               /S /Transparency
-            >>
-     /Subtype /Form
-     /Resources << >>
-     /BBox [ 0.000000 0.000000 20.000000 20.000000 ]
-  >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 5.000000 3.000000 cm
-0.380392 0.392157 0.411765 scn
-0.000000 14.000000 m
-6.333253 14.000000 l
-10.000000 9.800000 l
-10.000000 0.000000 l
-0.000000 0.000000 l
-0.000000 14.000000 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-4 0 obj
-  252
-endobj
-
-5 0 obj
-  << /XObject << /X1 1 0 R >>
-     /ExtGState << /E1 << /SMask << /Type /Mask
-                                    /G 3 0 R
-                                    /S /Alpha
-                                 >>
-                          /Type /ExtGState
-                       >> >>
-  >>
-endobj
-
-6 0 obj
-  << /Length 7 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.090196 0.439216 0.956863 scn
-2.000000 2.000000 m
-14.000000 2.000000 l
-14.000000 13.251528 l
-9.867070 18.000000 l
-2.000000 18.000000 l
-2.000000 2.000000 l
-h
-2.000000 20.000000 m
-0.895431 20.000000 0.000000 19.104568 0.000000 18.000000 c
-0.000000 2.000000 l
-0.000000 0.895430 0.895431 0.000000 2.000000 0.000000 c
-14.000000 0.000000 l
-15.104569 0.000000 16.000000 0.895430 16.000000 2.000000 c
-16.000000 13.251528 l
-16.000000 13.734164 15.825472 14.200521 15.508610 14.564576 c
-11.375679 19.313049 l
-10.995841 19.749458 10.445629 20.000000 9.867069 20.000000 c
-2.000000 20.000000 l
-h
-f*
-n
-Q
-q
-/E1 gs
-/X1 Do
-Q
-
-endstream
-endobj
-
-7 0 obj
-  698
-endobj
-
-8 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 5 0 R
-     /Contents 6 0 R
-     /Parent 9 0 R
-  >>
-endobj
-
-9 0 obj
-  << /Kids [ 8 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-10 0 obj
-  << /Pages 9 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 11
-0000000000 65535 f
-0000000010 00000 n
-0000000812 00000 n
-0000000834 00000 n
-0000001334 00000 n
-0000001356 00000 n
-0000001654 00000 n
-0000002408 00000 n
-0000002430 00000 n
-0000002603 00000 n
-0000002677 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 10 0 R
-   /Size 11
->>
-startxref
-2737
-%%EOF

+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Select=false-6.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "bates.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "base-placeholder.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 0 - 191
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_false.imageset/Select=false-6.pdf

@@ -1,191 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-2.000000 17.999996 m
-2.000000 19.104565 2.895431 19.999996 4.000000 19.999996 c
-11.867069 19.999996 l
-12.445629 19.999996 12.995841 19.749454 13.375679 19.313046 c
-17.508610 14.564572 l
-17.825472 14.200518 18.000000 13.734160 18.000000 13.251524 c
-18.000000 1.999996 l
-18.000000 0.895426 17.104568 -0.000004 16.000000 -0.000004 c
-4.000000 -0.000004 l
-2.895431 -0.000004 2.000000 0.895426 2.000000 1.999996 c
-2.000000 17.999996 l
-h
-W*
-n
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.380392 0.392157 0.411765 scn
-15.508610 14.564576 m
-14.000000 13.251528 l
-15.508610 14.564576 l
-h
-11.375679 19.313049 m
-9.867070 18.000000 l
-11.375679 19.313049 l
-h
-14.000000 2.000000 m
-2.000000 2.000000 l
-2.000000 -2.000000 l
-14.000000 -2.000000 l
-14.000000 2.000000 l
-h
-2.000000 2.000000 m
-2.000000 18.000000 l
--2.000000 18.000000 l
--2.000000 2.000000 l
-2.000000 2.000000 l
-h
-2.000000 18.000000 m
-9.867069 18.000000 l
-9.867069 22.000000 l
-2.000000 22.000000 l
-2.000000 18.000000 l
-h
-14.000000 13.251528 m
-14.000000 2.000000 l
-18.000000 2.000000 l
-18.000000 13.251528 l
-14.000000 13.251528 l
-h
-9.867070 18.000000 m
-14.000000 13.251528 l
-17.017220 15.877625 l
-12.884289 20.626099 l
-9.867070 18.000000 l
-h
-18.000000 13.251528 m
-18.000000 14.216801 17.650944 15.149515 17.017220 15.877625 c
-14.000000 13.251528 l
-14.000000 13.251528 l
-18.000000 13.251528 l
-h
-9.867069 18.000000 m
-9.867070 18.000000 l
-12.884289 20.626099 l
-12.124612 21.498919 11.024188 22.000000 9.867069 22.000000 c
-9.867069 18.000000 l
-h
-2.000000 2.000000 m
-2.000000 2.000000 l
--2.000000 2.000000 l
--2.000000 -0.209139 -0.209139 -2.000000 2.000000 -2.000000 c
-2.000000 2.000000 l
-h
-14.000000 -2.000000 m
-16.209139 -2.000000 18.000000 -0.209139 18.000000 2.000000 c
-14.000000 2.000000 l
-14.000000 2.000000 l
-14.000000 -2.000000 l
-h
-2.000000 18.000000 m
-2.000000 18.000000 l
-2.000000 22.000000 l
--0.209139 22.000000 -2.000000 20.209139 -2.000000 18.000000 c
-2.000000 18.000000 l
-h
-f
-n
-Q
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 6.204102 6.000000 cm
-0.380392 0.392157 0.411765 scn
-2.218262 0.000000 m
-2.604980 1.928223 l
-3.770508 1.928223 l
-3.383789 0.000000 l
-4.801758 0.000000 l
-5.183105 1.928223 l
-6.461426 1.928223 l
-6.719238 3.281738 l
-5.451660 3.281738 l
-5.704102 4.565430 l
-6.960938 4.565430 l
-7.218750 5.918945 l
-5.972656 5.918945 l
-6.337891 7.755859 l
-4.919922 7.755859 l
-4.560059 5.918945 l
-3.389160 5.918945 l
-3.754395 7.755859 l
-2.347168 7.755859 l
-1.981934 5.918945 l
-0.751953 5.918945 l
-0.494141 4.565430 l
-1.713379 4.565430 l
-1.460938 3.281738 l
-0.257812 3.281738 l
-0.000000 1.928223 l
-1.192383 1.928223 l
-0.811035 0.000000 l
-2.218262 0.000000 l
-h
-2.750000 3.168945 m
-3.045410 4.662109 l
-4.409668 4.662109 l
-4.114258 3.168945 l
-2.750000 3.168945 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  2763
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000002853 00000 n
-0000002876 00000 n
-0000003049 00000 n
-0000003123 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-3182
-%%EOF

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_false.imageset/base-placeholder.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_false.imageset/bates.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Select=true-6.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 191
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_bates_true.imageset/Select=true-6.pdf

@@ -1,191 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-2.000000 17.999996 m
-2.000000 19.104565 2.895431 19.999996 4.000000 19.999996 c
-11.867069 19.999996 l
-12.445629 19.999996 12.995841 19.749454 13.375679 19.313046 c
-17.508610 14.564572 l
-17.825472 14.200518 18.000000 13.734160 18.000000 13.251524 c
-18.000000 1.999996 l
-18.000000 0.895426 17.104568 -0.000004 16.000000 -0.000004 c
-4.000000 -0.000004 l
-2.895431 -0.000004 2.000000 0.895426 2.000000 1.999996 c
-2.000000 17.999996 l
-h
-W*
-n
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.090196 0.439216 0.956863 scn
-15.508610 14.564576 m
-14.000000 13.251528 l
-15.508610 14.564576 l
-h
-11.375679 19.313049 m
-9.867070 18.000000 l
-11.375679 19.313049 l
-h
-14.000000 2.000000 m
-2.000000 2.000000 l
-2.000000 -2.000000 l
-14.000000 -2.000000 l
-14.000000 2.000000 l
-h
-2.000000 2.000000 m
-2.000000 18.000000 l
--2.000000 18.000000 l
--2.000000 2.000000 l
-2.000000 2.000000 l
-h
-2.000000 18.000000 m
-9.867069 18.000000 l
-9.867069 22.000000 l
-2.000000 22.000000 l
-2.000000 18.000000 l
-h
-14.000000 13.251528 m
-14.000000 2.000000 l
-18.000000 2.000000 l
-18.000000 13.251528 l
-14.000000 13.251528 l
-h
-9.867070 18.000000 m
-14.000000 13.251528 l
-17.017220 15.877625 l
-12.884289 20.626099 l
-9.867070 18.000000 l
-h
-18.000000 13.251528 m
-18.000000 14.216801 17.650944 15.149515 17.017220 15.877625 c
-14.000000 13.251528 l
-14.000000 13.251528 l
-18.000000 13.251528 l
-h
-9.867069 18.000000 m
-9.867070 18.000000 l
-12.884289 20.626099 l
-12.124612 21.498919 11.024188 22.000000 9.867069 22.000000 c
-9.867069 18.000000 l
-h
-2.000000 2.000000 m
-2.000000 2.000000 l
--2.000000 2.000000 l
--2.000000 -0.209139 -0.209139 -2.000000 2.000000 -2.000000 c
-2.000000 2.000000 l
-h
-14.000000 -2.000000 m
-16.209139 -2.000000 18.000000 -0.209139 18.000000 2.000000 c
-14.000000 2.000000 l
-14.000000 2.000000 l
-14.000000 -2.000000 l
-h
-2.000000 18.000000 m
-2.000000 18.000000 l
-2.000000 22.000000 l
--0.209139 22.000000 -2.000000 20.209139 -2.000000 18.000000 c
-2.000000 18.000000 l
-h
-f
-n
-Q
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 6.204102 6.000000 cm
-0.090196 0.439216 0.956863 scn
-2.218262 0.000000 m
-2.604980 1.928223 l
-3.770508 1.928223 l
-3.383789 0.000000 l
-4.801758 0.000000 l
-5.183105 1.928223 l
-6.461426 1.928223 l
-6.719238 3.281738 l
-5.451660 3.281738 l
-5.704102 4.565430 l
-6.960938 4.565430 l
-7.218750 5.918945 l
-5.972656 5.918945 l
-6.337891 7.755859 l
-4.919922 7.755859 l
-4.560059 5.918945 l
-3.389160 5.918945 l
-3.754395 7.755859 l
-2.347168 7.755859 l
-1.981934 5.918945 l
-0.751953 5.918945 l
-0.494141 4.565430 l
-1.713379 4.565430 l
-1.460938 3.281738 l
-0.257812 3.281738 l
-0.000000 1.928223 l
-1.192383 1.928223 l
-0.811035 0.000000 l
-2.218262 0.000000 l
-h
-2.750000 3.168945 m
-3.045410 4.662109 l
-4.409668 4.662109 l
-4.114258 3.168945 l
-2.750000 3.168945 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  2763
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000002853 00000 n
-0000002876 00000 n
-0000003049 00000 n
-0000003123 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-3182
-%%EOF

+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Select=false-1.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "compress.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "compress 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 0 - 182
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_false.imageset/Select=false-1.pdf

@@ -1,182 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-2.000000 17.999996 m
-2.000000 19.104565 2.895431 19.999996 4.000000 19.999996 c
-11.867069 19.999996 l
-12.445629 19.999996 12.995841 19.749454 13.375679 19.313046 c
-17.508610 14.564572 l
-17.825472 14.200518 18.000000 13.734160 18.000000 13.251524 c
-18.000000 1.999996 l
-18.000000 0.895426 17.104568 -0.000004 16.000000 -0.000004 c
-4.000000 -0.000004 l
-2.895431 -0.000004 2.000000 0.895426 2.000000 1.999996 c
-2.000000 17.999996 l
-h
-W*
-n
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.380392 0.392157 0.411765 scn
-15.508610 14.564576 m
-14.000000 13.251528 l
-15.508610 14.564576 l
-h
-11.375679 19.313049 m
-9.867070 18.000000 l
-11.375679 19.313049 l
-h
-14.000000 2.000000 m
-2.000000 2.000000 l
-2.000000 -2.000000 l
-14.000000 -2.000000 l
-14.000000 2.000000 l
-h
-2.000000 2.000000 m
-2.000000 18.000000 l
--2.000000 18.000000 l
--2.000000 2.000000 l
-2.000000 2.000000 l
-h
-2.000000 18.000000 m
-9.867069 18.000000 l
-9.867069 22.000000 l
-2.000000 22.000000 l
-2.000000 18.000000 l
-h
-14.000000 13.251528 m
-14.000000 2.000000 l
-18.000000 2.000000 l
-18.000000 13.251528 l
-14.000000 13.251528 l
-h
-9.867070 18.000000 m
-14.000000 13.251528 l
-17.017220 15.877625 l
-12.884289 20.626099 l
-9.867070 18.000000 l
-h
-18.000000 13.251528 m
-18.000000 14.216801 17.650944 15.149515 17.017220 15.877625 c
-14.000000 13.251528 l
-14.000000 13.251528 l
-18.000000 13.251528 l
-h
-9.867069 18.000000 m
-9.867070 18.000000 l
-12.884289 20.626099 l
-12.124612 21.498919 11.024188 22.000000 9.867069 22.000000 c
-9.867069 18.000000 l
-h
-2.000000 2.000000 m
-2.000000 2.000000 l
--2.000000 2.000000 l
--2.000000 -0.209139 -0.209139 -2.000000 2.000000 -2.000000 c
-2.000000 2.000000 l
-h
-14.000000 -2.000000 m
-16.209139 -2.000000 18.000000 -0.209139 18.000000 2.000000 c
-14.000000 2.000000 l
-14.000000 2.000000 l
-14.000000 -2.000000 l
-h
-2.000000 18.000000 m
-2.000000 18.000000 l
-2.000000 22.000000 l
--0.209139 22.000000 -2.000000 20.209139 -2.000000 18.000000 c
-2.000000 18.000000 l
-h
-f
-n
-Q
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 6.000000 4.000000 cm
-0.380392 0.392157 0.411765 scn
-2.000000 14.000000 m
-0.000000 14.000000 l
-0.000000 12.000000 l
-2.000000 12.000000 l
-2.000000 10.000000 l
-0.000000 10.000000 l
-0.000000 8.000000 l
-2.000000 8.000000 l
-2.000000 6.000000 l
-0.000000 6.000000 l
-0.000000 4.000000 l
-0.000000 1.000000 l
-0.000000 0.447716 0.447715 0.000000 1.000000 0.000000 c
-3.000000 0.000000 l
-3.552285 0.000000 4.000000 0.447716 4.000000 1.000000 c
-4.000000 4.000000 l
-2.000000 4.000000 l
-2.000000 6.000000 l
-4.000000 6.000000 l
-4.000000 8.000000 l
-2.000000 8.000000 l
-2.000000 10.000000 l
-4.000000 10.000000 l
-4.000000 12.000000 l
-2.000000 12.000000 l
-2.000000 14.000000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  2685
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000002775 00000 n
-0000002798 00000 n
-0000002971 00000 n
-0000003045 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-3104
-%%EOF

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_false.imageset/compress 1.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_false.imageset/compress.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Select=true-1.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 182
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_compress_true.imageset/Select=true-1.pdf

@@ -1,182 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-2.000000 17.999996 m
-2.000000 19.104565 2.895431 19.999996 4.000000 19.999996 c
-11.867069 19.999996 l
-12.445629 19.999996 12.995841 19.749454 13.375679 19.313046 c
-17.508610 14.564572 l
-17.825472 14.200518 18.000000 13.734160 18.000000 13.251524 c
-18.000000 1.999996 l
-18.000000 0.895426 17.104568 -0.000004 16.000000 -0.000004 c
-4.000000 -0.000004 l
-2.895431 -0.000004 2.000000 0.895426 2.000000 1.999996 c
-2.000000 17.999996 l
-h
-W*
-n
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.090196 0.439216 0.956863 scn
-15.508610 14.564576 m
-14.000000 13.251528 l
-15.508610 14.564576 l
-h
-11.375679 19.313049 m
-9.867070 18.000000 l
-11.375679 19.313049 l
-h
-14.000000 2.000000 m
-2.000000 2.000000 l
-2.000000 -2.000000 l
-14.000000 -2.000000 l
-14.000000 2.000000 l
-h
-2.000000 2.000000 m
-2.000000 18.000000 l
--2.000000 18.000000 l
--2.000000 2.000000 l
-2.000000 2.000000 l
-h
-2.000000 18.000000 m
-9.867069 18.000000 l
-9.867069 22.000000 l
-2.000000 22.000000 l
-2.000000 18.000000 l
-h
-14.000000 13.251528 m
-14.000000 2.000000 l
-18.000000 2.000000 l
-18.000000 13.251528 l
-14.000000 13.251528 l
-h
-9.867070 18.000000 m
-14.000000 13.251528 l
-17.017220 15.877625 l
-12.884289 20.626099 l
-9.867070 18.000000 l
-h
-18.000000 13.251528 m
-18.000000 14.216801 17.650944 15.149515 17.017220 15.877625 c
-14.000000 13.251528 l
-14.000000 13.251528 l
-18.000000 13.251528 l
-h
-9.867069 18.000000 m
-9.867070 18.000000 l
-12.884289 20.626099 l
-12.124612 21.498919 11.024188 22.000000 9.867069 22.000000 c
-9.867069 18.000000 l
-h
-2.000000 2.000000 m
-2.000000 2.000000 l
--2.000000 2.000000 l
--2.000000 -0.209139 -0.209139 -2.000000 2.000000 -2.000000 c
-2.000000 2.000000 l
-h
-14.000000 -2.000000 m
-16.209139 -2.000000 18.000000 -0.209139 18.000000 2.000000 c
-14.000000 2.000000 l
-14.000000 2.000000 l
-14.000000 -2.000000 l
-h
-2.000000 18.000000 m
-2.000000 18.000000 l
-2.000000 22.000000 l
--0.209139 22.000000 -2.000000 20.209139 -2.000000 18.000000 c
-2.000000 18.000000 l
-h
-f
-n
-Q
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 6.000000 4.000000 cm
-0.090196 0.439216 0.956863 scn
-2.000000 14.000000 m
-0.000000 14.000000 l
-0.000000 12.000000 l
-2.000000 12.000000 l
-2.000000 10.000000 l
-0.000000 10.000000 l
-0.000000 8.000000 l
-2.000000 8.000000 l
-2.000000 6.000000 l
-0.000000 6.000000 l
-0.000000 4.000000 l
-0.000000 1.000000 l
-0.000000 0.447715 0.447715 0.000000 1.000000 0.000000 c
-3.000000 0.000000 l
-3.552285 0.000000 4.000000 0.447715 4.000000 1.000000 c
-4.000000 4.000000 l
-2.000000 4.000000 l
-2.000000 6.000000 l
-4.000000 6.000000 l
-4.000000 8.000000 l
-2.000000 8.000000 l
-2.000000 10.000000 l
-4.000000 10.000000 l
-4.000000 12.000000 l
-2.000000 12.000000 l
-2.000000 14.000000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  2685
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000002775 00000 n
-0000002798 00000 n
-0000002971 00000 n
-0000003045 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-3104
-%%EOF

+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Select=false.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "word.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "base-placeholder.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 0 - 115
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_false.imageset/Select=false.pdf

@@ -1,115 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 0.330811 0.000000 cm
-0.380392 0.392157 0.411765 scn
-2.669156 17.400000 m
-2.669156 18.835941 3.833216 20.000000 5.269156 20.000000 c
-9.669156 20.000000 l
-12.669156 20.000000 l
-14.069156 20.000000 l
-15.505095 20.000000 16.669155 18.835941 16.669155 17.400000 c
-16.669155 12.186018 l
-18.071136 13.743163 l
-19.409357 12.256837 l
-16.676302 9.221302 l
-16.007193 8.478139 l
-15.338081 9.221302 l
-12.605026 12.256837 l
-13.943247 13.743163 l
-14.669156 12.936914 l
-14.669156 17.400000 l
-14.669156 17.731371 14.400527 18.000000 14.069156 18.000000 c
-12.669156 18.000000 l
-9.669156 18.000000 l
-5.269156 18.000000 l
-4.937785 18.000000 4.669156 17.731371 4.669156 17.400000 c
-4.669156 14.750000 l
-2.669156 14.750000 l
-2.669156 17.400000 l
-h
-4.669156 8.141994 m
-4.669156 2.600000 l
-4.669156 2.268629 4.937786 2.000000 5.269156 2.000000 c
-6.669156 2.000000 l
-9.669156 2.000000 l
-14.069156 2.000000 l
-14.400526 2.000000 14.669156 2.268629 14.669156 2.600000 c
-14.669156 5.250000 l
-16.669155 5.250000 l
-16.669155 2.600000 l
-16.669155 1.164061 15.505096 0.000000 14.069156 0.000000 c
-9.669156 0.000000 l
-6.669156 0.000000 l
-5.269156 0.000000 l
-3.833215 0.000000 2.669156 1.164061 2.669156 2.600000 c
-2.669156 8.735073 l
-1.338220 7.256837 l
-0.000000 8.743163 l
-2.733055 11.778698 l
-3.402165 12.521861 l
-4.071275 11.778698 l
-6.804331 8.743163 l
-5.466110 7.256837 l
-4.669156 8.141994 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1439
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001529 00000 n
-0000001552 00000 n
-0000001725 00000 n
-0000001799 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1858
-%%EOF

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_false.imageset/base-placeholder.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_false.imageset/word.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Select=true.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 115
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_convertPDF_true.imageset/Select=true.pdf

@@ -1,115 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 0.330811 0.000000 cm
-0.090196 0.439216 0.956863 scn
-2.669156 17.400000 m
-2.669156 18.835941 3.833216 20.000000 5.269156 20.000000 c
-9.669156 20.000000 l
-12.669156 20.000000 l
-14.069156 20.000000 l
-15.505095 20.000000 16.669155 18.835941 16.669155 17.400000 c
-16.669155 12.186018 l
-18.071136 13.743163 l
-19.409357 12.256837 l
-16.676302 9.221302 l
-16.007193 8.478139 l
-15.338081 9.221302 l
-12.605026 12.256837 l
-13.943247 13.743163 l
-14.669156 12.936914 l
-14.669156 17.400000 l
-14.669156 17.731371 14.400527 18.000000 14.069156 18.000000 c
-12.669156 18.000000 l
-9.669156 18.000000 l
-5.269156 18.000000 l
-4.937785 18.000000 4.669156 17.731371 4.669156 17.400000 c
-4.669156 14.750000 l
-2.669156 14.750000 l
-2.669156 17.400000 l
-h
-4.669156 8.141994 m
-4.669156 2.600000 l
-4.669156 2.268629 4.937786 2.000000 5.269156 2.000000 c
-6.669156 2.000000 l
-9.669156 2.000000 l
-14.069156 2.000000 l
-14.400526 2.000000 14.669156 2.268629 14.669156 2.600000 c
-14.669156 5.250000 l
-16.669155 5.250000 l
-16.669155 2.600000 l
-16.669155 1.164061 15.505096 0.000000 14.069156 0.000000 c
-9.669156 0.000000 l
-6.669156 0.000000 l
-5.269156 0.000000 l
-3.833215 0.000000 2.669156 1.164061 2.669156 2.600000 c
-2.669156 8.735073 l
-1.338220 7.256837 l
-0.000000 8.743163 l
-2.733055 11.778698 l
-3.402165 12.521861 l
-4.071275 11.778698 l
-6.804331 8.743163 l
-5.466110 7.256837 l
-4.669156 8.141994 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1439
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001529 00000 n
-0000001552 00000 n
-0000001725 00000 n
-0000001799 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1858
-%%EOF

+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Select=false-5.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "header&footer.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "base-placeholder.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 0 - 103
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_false.imageset/Select=false-5.pdf

@@ -1,103 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.380392 0.392157 0.411765 scn
-2.000000 2.000000 m
-14.000000 2.000000 l
-14.000000 13.251528 l
-9.867070 18.000000 l
-2.000000 18.000000 l
-2.000000 2.000000 l
-h
-2.000000 20.000000 m
-0.895431 20.000000 0.000000 19.104568 0.000000 18.000000 c
-0.000000 2.000000 l
-0.000000 0.895430 0.895431 0.000000 2.000000 0.000000 c
-14.000000 0.000000 l
-15.104569 0.000000 16.000000 0.895430 16.000000 2.000000 c
-16.000000 13.251528 l
-16.000000 13.734164 15.825472 14.200521 15.508610 14.564576 c
-11.375679 19.313049 l
-10.995841 19.749458 10.445629 20.000000 9.867069 20.000000 c
-2.000000 20.000000 l
-h
-f*
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 5.000000 3.000000 cm
-0.380392 0.392157 0.411765 scn
-6.333253 14.000000 m
-0.000000 14.000000 l
-0.000000 8.000000 l
-10.000000 8.000000 l
-10.000000 9.800000 l
-6.333253 14.000000 l
-h
-10.000000 4.000000 m
-0.000000 4.000000 l
-0.000000 0.000000 l
-10.000000 0.000000 l
-10.000000 4.000000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1010
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001100 00000 n
-0000001123 00000 n
-0000001296 00000 n
-0000001370 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1429
-%%EOF

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_false.imageset/base-placeholder.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_false.imageset/header&footer.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Select=true-5.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 103
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_headerAndFooter_true.imageset/Select=true-5.pdf

@@ -1,103 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.090196 0.439216 0.956863 scn
-2.000000 2.000000 m
-14.000000 2.000000 l
-14.000000 13.251528 l
-9.867070 18.000000 l
-2.000000 18.000000 l
-2.000000 2.000000 l
-h
-2.000000 20.000000 m
-0.895431 20.000000 0.000000 19.104568 0.000000 18.000000 c
-0.000000 2.000000 l
-0.000000 0.895430 0.895431 0.000000 2.000000 0.000000 c
-14.000000 0.000000 l
-15.104569 0.000000 16.000000 0.895430 16.000000 2.000000 c
-16.000000 13.251528 l
-16.000000 13.734164 15.825472 14.200521 15.508610 14.564576 c
-11.375679 19.313049 l
-10.995841 19.749458 10.445629 20.000000 9.867069 20.000000 c
-2.000000 20.000000 l
-h
-f*
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 5.000000 3.000000 cm
-0.090196 0.439216 0.956863 scn
-6.333253 14.000000 m
-0.000000 14.000000 l
-0.000000 8.000000 l
-10.000000 8.000000 l
-10.000000 9.800000 l
-6.333253 14.000000 l
-h
-10.000000 4.000000 m
-0.000000 4.000000 l
-0.000000 0.000000 l
-10.000000 0.000000 l
-10.000000 4.000000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1010
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001100 00000 n
-0000001123 00000 n
-0000001296 00000 n
-0000001370 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1429
-%%EOF

+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Select=false-7.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "delete.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "base-placeholder.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 0 - 97
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_false.imageset/Select=false-7.pdf

@@ -1,97 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 1.000000 0.000000 cm
-0.380392 0.392157 0.411765 scn
-7.000000 18.000000 m
-11.000000 18.000000 l
-11.000000 20.000000 l
-7.000000 20.000000 l
-7.000000 18.000000 l
-h
-16.000000 15.000000 m
-18.000000 15.000000 l
-18.000000 17.000000 l
-14.000000 17.000000 l
-4.000000 17.000000 l
-0.000000 17.000000 l
-0.000000 15.000000 l
-2.000000 15.000000 l
-2.000000 2.000000 l
-2.000000 0.895430 2.895430 0.000000 4.000000 0.000000 c
-14.000000 0.000000 l
-15.104569 0.000000 16.000000 0.895430 16.000000 2.000000 c
-16.000000 15.000000 l
-h
-14.000000 15.000000 m
-4.000000 15.000000 l
-4.000000 2.000000 l
-14.000000 2.000000 l
-14.000000 15.000000 l
-h
-8.000000 5.000000 m
-8.000000 12.000000 l
-10.000000 12.000000 l
-10.000000 5.000000 l
-8.000000 5.000000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  801
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000000891 00000 n
-0000000913 00000 n
-0000001086 00000 n
-0000001160 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1219
-%%EOF

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_false.imageset/base-placeholder.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_false.imageset/delete.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Select=true-7.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 97
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_remove_true.imageset/Select=true-7.pdf

@@ -1,97 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 1.000000 0.000000 cm
-0.090196 0.439216 0.956863 scn
-7.000000 18.000000 m
-11.000000 18.000000 l
-11.000000 20.000000 l
-7.000000 20.000000 l
-7.000000 18.000000 l
-h
-16.000000 15.000000 m
-18.000000 15.000000 l
-18.000000 17.000000 l
-14.000000 17.000000 l
-4.000000 17.000000 l
-0.000000 17.000000 l
-0.000000 15.000000 l
-2.000000 15.000000 l
-2.000000 2.000000 l
-2.000000 0.895430 2.895430 0.000000 4.000000 0.000000 c
-14.000000 0.000000 l
-15.104569 0.000000 16.000000 0.895430 16.000000 2.000000 c
-16.000000 15.000000 l
-h
-14.000000 15.000000 m
-4.000000 15.000000 l
-4.000000 2.000000 l
-14.000000 2.000000 l
-14.000000 15.000000 l
-h
-8.000000 5.000000 m
-8.000000 12.000000 l
-10.000000 12.000000 l
-10.000000 5.000000 l
-8.000000 5.000000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  801
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000000891 00000 n
-0000000913 00000 n
-0000001086 00000 n
-0000001160 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1219
-%%EOF

+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Select=false-2.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "security.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

File diff suppressed because it is too large
+ 0 - 1237
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_false.imageset/Select=false-2.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_false.imageset/ic.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_false.imageset/security.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Select=true-2.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

File diff suppressed because it is too large
+ 0 - 1237
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_security_true.imageset/Select=true-2.pdf


+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Select=false-3.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "watermark.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "base-placeholder.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 0 - 117
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_false.imageset/Select=false-3.pdf

@@ -1,117 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.380392 0.392157 0.411765 scn
-2.000000 2.000000 m
-14.000000 2.000000 l
-14.000000 13.251528 l
-9.867070 18.000000 l
-2.000000 18.000000 l
-2.000000 2.000000 l
-h
-2.000000 20.000000 m
-0.895431 20.000000 0.000000 19.104568 0.000000 18.000000 c
-0.000000 2.000000 l
-0.000000 0.895430 0.895431 0.000000 2.000000 0.000000 c
-14.000000 0.000000 l
-15.104569 0.000000 16.000000 0.895430 16.000000 2.000000 c
-16.000000 13.251528 l
-16.000000 13.734164 15.825472 14.200521 15.508610 14.564576 c
-11.375679 19.313049 l
-10.995841 19.749458 10.445629 20.000000 9.867069 20.000000 c
-2.000000 20.000000 l
-h
-f*
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 6.053711 5.883789 cm
-0.380392 0.392157 0.411765 scn
-2.454102 0.000000 m
-3.424805 0.000000 4.238281 0.410156 4.573242 1.059570 c
-4.703125 1.059570 l
-4.703125 0.116211 l
-7.082031 0.116211 l
-7.082031 5.304688 l
-7.082031 6.945312 5.885742 7.902344 3.787109 7.902344 c
-1.729492 7.902344 0.416992 6.979492 0.280273 5.578125 c
-0.273438 5.496094 l
-2.467773 5.496094 l
-2.481445 5.530273 l
-2.625000 5.913086 3.014648 6.125000 3.650391 6.125000 c
-4.320312 6.125000 4.703125 5.817383 4.703125 5.304688 c
-4.703125 4.709961 l
-3.041992 4.614258 l
-1.080078 4.491211 0.000000 3.691406 0.000000 2.310547 c
-0.000000 2.296875 l
-0.000000 0.909180 0.998047 0.000000 2.454102 0.000000 c
-h
-2.331055 2.467773 m
-2.331055 2.481445 l
-2.331055 2.932617 2.707031 3.219727 3.424805 3.267578 c
-4.703125 3.349609 l
-4.703125 2.850586 l
-4.703125 2.194336 4.108398 1.688477 3.342773 1.688477 c
-2.734375 1.688477 2.331055 1.989258 2.331055 2.467773 c
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1641
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001731 00000 n
-0000001754 00000 n
-0000001927 00000 n
-0000002001 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-2060
-%%EOF

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_false.imageset/base-placeholder.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_false.imageset/watermark.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Select=true-3.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 117
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_batchtool_watermark_true.imageset/Select=true-3.pdf

@@ -1,117 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 2.000000 -0.000004 cm
-0.090196 0.439216 0.956863 scn
-2.000000 2.000000 m
-14.000000 2.000000 l
-14.000000 13.251528 l
-9.867070 18.000000 l
-2.000000 18.000000 l
-2.000000 2.000000 l
-h
-2.000000 20.000000 m
-0.895431 20.000000 0.000000 19.104568 0.000000 18.000000 c
-0.000000 2.000000 l
-0.000000 0.895430 0.895431 0.000000 2.000000 0.000000 c
-14.000000 0.000000 l
-15.104569 0.000000 16.000000 0.895430 16.000000 2.000000 c
-16.000000 13.251528 l
-16.000000 13.734164 15.825472 14.200521 15.508610 14.564576 c
-11.375679 19.313049 l
-10.995841 19.749458 10.445629 20.000000 9.867069 20.000000 c
-2.000000 20.000000 l
-h
-f*
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 6.053711 5.883789 cm
-0.090196 0.439216 0.956863 scn
-2.454102 0.000000 m
-3.424805 0.000000 4.238281 0.410156 4.573242 1.059570 c
-4.703125 1.059570 l
-4.703125 0.116211 l
-7.082031 0.116211 l
-7.082031 5.304688 l
-7.082031 6.945312 5.885742 7.902344 3.787109 7.902344 c
-1.729492 7.902344 0.416992 6.979492 0.280273 5.578125 c
-0.273438 5.496094 l
-2.467773 5.496094 l
-2.481445 5.530273 l
-2.625000 5.913086 3.014648 6.125000 3.650391 6.125000 c
-4.320312 6.125000 4.703125 5.817383 4.703125 5.304688 c
-4.703125 4.709961 l
-3.041992 4.614258 l
-1.080078 4.491211 0.000000 3.691406 0.000000 2.310547 c
-0.000000 2.296875 l
-0.000000 0.909180 0.998047 0.000000 2.454102 0.000000 c
-h
-2.331055 2.467773 m
-2.331055 2.481445 l
-2.331055 2.932617 2.707031 3.219727 3.424805 3.267578 c
-4.703125 3.349609 l
-4.703125 2.850586 l
-4.703125 2.194336 4.108398 1.688477 3.342773 1.688477 c
-2.734375 1.688477 2.331055 1.989258 2.331055 2.467773 c
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1641
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001731 00000 n
-0000001754 00000 n
-0000001927 00000 n
-0000002001 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-2060
-%%EOF

+ 10 - 9
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_false.imageset/Contents.json

@@ -1,17 +1,18 @@
 {
   "images" : [
     {
-      "filename" : "Disabled=false, State=norm.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename" : "trash.pdf",
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icon_prefix.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 0 - 95
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_false.imageset/Disabled=false, State=norm.pdf

@@ -1,95 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 1.000000 0.250000 cm
-0.380392 0.392157 0.411765 scn
-5.000000 14.000000 m
-9.000000 14.000000 l
-9.000000 15.500000 l
-5.000000 15.500000 l
-5.000000 14.000000 l
-h
-0.000000 11.500000 m
-1.250000 11.500000 l
-1.250000 0.750000 l
-1.250000 0.335787 1.585786 0.000000 2.000000 0.000000 c
-12.000000 0.000000 l
-12.414213 0.000000 12.750000 0.335787 12.750000 0.750000 c
-12.750000 11.500000 l
-14.000000 11.500000 l
-14.000000 13.000000 l
-0.000000 13.000000 l
-0.000000 11.500000 l
-h
-2.750000 1.500000 m
-2.750000 11.500000 l
-11.250000 11.500000 l
-11.250000 1.500000 l
-2.750000 1.500000 l
-h
-6.250000 9.250000 m
-6.250000 4.250000 l
-7.750000 4.250000 l
-7.750000 9.250000 l
-6.250000 9.250000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  749
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000000839 00000 n
-0000000861 00000 n
-0000001034 00000 n
-0000001108 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1167
-%%EOF

BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_false.imageset/icon_prefix.pdf


BIN
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_false.imageset/trash.pdf


+ 0 - 21
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_true.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Disabled=true, State=norm.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 95
PDF Office/PDF Master/KMClass/NewBatch/Source/Batch.xcassets/icon_btn_clear_norm_true.imageset/Disabled=true, State=norm.pdf

@@ -1,95 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 1.000000 0.250000 cm
-0.694118 0.701961 0.721569 scn
-5.000000 14.000000 m
-9.000000 14.000000 l
-9.000000 15.500000 l
-5.000000 15.500000 l
-5.000000 14.000000 l
-h
-0.000000 11.500000 m
-1.250000 11.500000 l
-1.250000 0.750000 l
-1.250000 0.335787 1.585786 0.000000 2.000000 0.000000 c
-12.000000 0.000000 l
-12.414213 0.000000 12.750000 0.335787 12.750000 0.750000 c
-12.750000 11.500000 l
-14.000000 11.500000 l
-14.000000 13.000000 l
-0.000000 13.000000 l
-0.000000 11.500000 l
-h
-2.750000 1.500000 m
-2.750000 11.500000 l
-11.250000 11.500000 l
-11.250000 1.500000 l
-2.750000 1.500000 l
-h
-6.250000 9.250000 m
-6.250000 4.250000 l
-7.750000 4.250000 l
-7.750000 9.250000 l
-6.250000 9.250000 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  749
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000000839 00000 n
-0000000861 00000 n
-0000001034 00000 n
-0000001108 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1167
-%%EOF

+ 5 - 1
PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/KMBatchCollectionView.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 class KMBatchCollectionView: BaseXibView {
     @IBOutlet weak var collectionView: NSCollectionView!
@@ -42,8 +43,11 @@ class KMBatchCollectionView: BaseXibView {
     override func setup() {
         super.setup()
         
+        self.wantsLayer = true
+        self.border(ComponentLibrary.shared.getComponentColorFromKey("colorBorder/divider"), 0.5)
+        
         self.contentView.wantsLayer = true
-        self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
+//        self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
         
         self.collectionView.delegate = self
         self.collectionView.dataSource = self

+ 6 - 6
PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/KMBatchCollectionView.xib

@@ -14,17 +14,17 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="615" height="364"/>
+            <rect key="frame" x="0.0" y="0.0" width="299" height="534"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaZ-yZ-XGg">
-                    <rect key="frame" x="0.0" y="0.0" width="615" height="356"/>
+                    <rect key="frame" x="0.0" y="0.0" width="299" height="518"/>
                     <clipView key="contentView" drawsBackground="NO" id="S4k-1R-KQT">
-                        <rect key="frame" x="0.0" y="0.0" width="615" height="356"/>
+                        <rect key="frame" x="0.0" y="0.0" width="299" height="518"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <collectionView id="Ld8-ua-fw8">
-                                <rect key="frame" x="0.0" y="0.0" width="615" height="356"/>
+                                <rect key="frame" x="0.0" y="0.0" width="299" height="518"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="bIe-ul-s0S">
                                     <size key="itemSize" width="50" height="50"/>
@@ -46,11 +46,11 @@
             </subviews>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="LaZ-yZ-XGg" secondAttribute="trailing" id="0Dj-l3-hSR"/>
-                <constraint firstItem="LaZ-yZ-XGg" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="8" id="F8C-v1-BEB"/>
+                <constraint firstItem="LaZ-yZ-XGg" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="16" id="F8C-v1-BEB"/>
                 <constraint firstAttribute="bottom" secondItem="LaZ-yZ-XGg" secondAttribute="bottom" id="YfA-CJ-RRF"/>
                 <constraint firstItem="LaZ-yZ-XGg" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="lc4-a0-Bbu"/>
             </constraints>
-            <point key="canvasLocation" x="12.5" y="201"/>
+            <point key="canvasLocation" x="238" y="186"/>
         </customView>
     </objects>
 </document>

+ 8 - 4
PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/Model/KMBatchCollectionViewModel.swift

@@ -9,26 +9,30 @@ import Cocoa
 
 enum KMBatchCollectionViewType: String {
     case unknow = "unknow"
-    case convertPDF = "ConvertPDF"
+    case convertPDF = "Convert"
+    case OCR = "OCR"
     case compress = "Compress"
     case security = "Security"
     case watermark = "Watermark"
     case background = "Background"
     case headerAndFooter = "Header & Footer"
-    case batesNumber = "Bates Number"
+    case batesNumber = "Bates"
     case batchRemove = "Batch Remove"
+    case imageToPDF = "imageToPDF"
     
     static func typeOfRawVale(value: String) -> KMBatchCollectionViewType {
         var type: KMBatchCollectionViewType
         switch value {
-        case "ConvertPDF": type = .convertPDF
+        case "Convert": type = .convertPDF
+        case "OCR": type = .OCR
         case "Compress": type = .compress
         case "Security": type = .security
         case "Watermark": type = .watermark
         case "Background": type = .background
         case "Header & Footer": type = .headerAndFooter
-        case "Bates Number": type = .batesNumber
+        case "Bates": type = .batesNumber
         case "Batch Remove": type = .batchRemove
+        case "imageToPDF": type = .imageToPDF
         default:
             type = .convertPDF
         }

+ 17 - 13
PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/Presenter/KMBatchCollectionViewPrensenter.swift

@@ -24,37 +24,41 @@ extension KMBatchCollectionViewPrensenter: KMBatchCollectionViewPrensenterProtoc
         self.modelData.removeAll()
         
         
-        let array = [["title":"ConvertPDF",
+        let array = [["title":"Convert",
                       "image":"icon_batchtool_convertPDF_false",
-                      "selectImage":"icon_batchtool_convertPDF_true",
+                      "selectImage":"icon_batchtool_convertPDF_false",
                       "isSelect": false],
+                     ["title":"OCR",
+                       "image":"icon_batchtool_OCR",
+                       "selectImage":"icon_batchtool_OCR",
+                       "isSelect": false],
                      ["title":"Compress",
                       "image":"icon_batchtool_compress_false",
-                      "selectImage":"icon_batchtool_compress_true",
+                      "selectImage":"icon_batchtool_compress_false",
                       "isSelect": false],
                      ["title":"Security",
                       "image":"icon_batchtool_security_false",
-                      "selectImage":"icon_batchtool_security_true",
+                      "selectImage":"icon_batchtool_security_false",
                       "isSelect": false],
                      ["title":"Watermark",
                       "image":"icon_batchtool_watermark_false",
-                      "selectImage":"icon_batchtool_watermark_true",
+                      "selectImage":"icon_batchtool_watermark_false",
                       "isSelect": false],
                      ["title":"Background",
                       "image":"icon_batchtool_background_false",
-                      "selectImage":"icon_batchtool_background_true",
+                      "selectImage":"icon_batchtool_background_false",
                       "isSelect": false],
                      ["title":"Header & Footer",
                       "image":"icon_batchtool_headerAndFooter_false",
-                      "selectImage":"icon_batchtool_headerAndFooter_true",
+                      "selectImage":"icon_batchtool_headerAndFooter_false",
                       "isSelect": false],
-                     ["title":"Bates Number",
+                     ["title":"Bates",
                       "image":"icon_batchtool_bates_false",
-                      "selectImage":"icon_batchtool_bates_true",
+                      "selectImage":"icon_batchtool_bates_false",
                       "isSelect": false],
                      ["title":"Batch Remove",
                       "image":"icon_batchtool_remove_false",
-                      "selectImage":"icon_batchtool_remove_true",
+                      "selectImage":"icon_batchtool_remove_false",
                       "isSelect": false]
         ]
         
@@ -66,9 +70,9 @@ extension KMBatchCollectionViewPrensenter: KMBatchCollectionViewPrensenterProtoc
             model.isSelect = dic["isSelect"] as! Bool
             model.type = KMBatchCollectionViewType.typeOfRawVale(value: dic["title"] as! String)
             //设置默认选中
-            if model.type == .convertPDF {
-                model.isSelect = true
-            }
+//            if model.type == .convertPDF {
+//                model.isSelect = true
+//            }
             self.modelData.append(model)
         }
         

+ 18 - 16
PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/View/KMBatchCollectionViewItem.swift

@@ -6,12 +6,10 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 class KMBatchCollectionViewItem: NSCollectionViewItem {
-
-    @IBOutlet weak var contentView: NSView!
-    @IBOutlet weak var iconImageView: NSImageView!
-    @IBOutlet weak var titleTextField: NSTextField!
+    @IBOutlet weak var titleButton: ComponentNavBarItem!
     
     var model: KMBatchCollectionViewModel = KMBatchCollectionViewModel() {
         didSet {
@@ -21,25 +19,29 @@ class KMBatchCollectionViewItem: NSCollectionViewItem {
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do view setup here.
-        self.contentView.wantsLayer = true
-        self.contentView.layer?.cornerRadius = 4
-        self.titleTextField.font = NSFont.SFProTextRegularFont(14.0)
+        self.titleButton.wantsLayer = true
+        self.titleButton.layer?.cornerRadius = 4
+        
+        let property = ComponentNavbarItemProperty(state: .normal,
+                                                   text: "",
+                                                   iconImage: nil)
+        
+        titleButton.properties = property
     }
     
     func reloadData() {
-        self.titleTextField.stringValue = NSLocalizedString(self.model.title, comment: "")
+        self.titleButton.properties.text = NSLocalizedString(self.model.title, comment: "")
+        
+        self.titleButton.properties.icon_hov_Image = NSImage(named: self.model.selectImageString)
+        self.titleButton.properties.iconImage = NSImage(named: self.model.imageString)
         
         if self.model.isSelect {
-            self.titleTextField.textColor = NSColor.km_init(hex: "#1770F4")
-            
-            self.iconImageView.image = NSImage(named: self.model.selectImageString)
-            self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#1770F4", alpha: 0.1).cgColor
+            self.titleButton.properties.state = .pressed
         } else {
-            self.titleTextField.textColor = NSColor.km_init(hex: "#616469")
-            
-            self.iconImageView.image = NSImage(named: self.model.imageString)
-            self.contentView.layer?.backgroundColor = NSColor.clear.cgColor
+            self.titleButton.properties.state = .normal
         }
+        
+        self.titleButton.reloadData()
     }
     
 }

+ 8 - 34
PDF Office/PDF Master/KMClass/NewBatch/View/BatchCollectionView/View/KMBatchCollectionViewItem.xib

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" 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="21507"/>
+        <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="KMBatchCollectionViewItem" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchCollectionViewItem" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
-                <outlet property="contentView" destination="M7b-ct-fs6" id="WQ7-qY-hUa"/>
-                <outlet property="iconImageView" destination="A4Q-jt-6W1" id="eo8-f1-TCZ"/>
-                <outlet property="titleTextField" destination="IO9-EJ-mU5" id="9Tq-Kc-Ifj"/>
+                <outlet property="titleButton" destination="M7b-ct-fs6" id="Sz5-pV-5JA"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>
@@ -20,39 +18,15 @@
             <rect key="frame" x="0.0" y="0.0" width="311" height="32"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="M7b-ct-fs6">
-                    <rect key="frame" x="8" y="0.0" width="295" height="32"/>
-                    <subviews>
-                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="A4Q-jt-6W1">
-                            <rect key="frame" x="8" y="6" width="16" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="20" id="oIS-kO-MN0"/>
-                                <constraint firstAttribute="width" constant="16" id="uTr-tV-Vcc"/>
-                            </constraints>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="EB6-xw-P0J"/>
-                        </imageView>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IO9-EJ-mU5">
-                            <rect key="frame" x="30" y="8" width="81" height="16"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" title="Convert PDF" id="qSs-zA-wWa">
-                                <font key="font" metaFont="system"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="A4Q-jt-6W1" firstAttribute="centerY" secondItem="M7b-ct-fs6" secondAttribute="centerY" id="Anf-bd-Dhx"/>
-                        <constraint firstItem="IO9-EJ-mU5" firstAttribute="centerY" secondItem="M7b-ct-fs6" secondAttribute="centerY" id="IZc-WJ-T7F"/>
-                        <constraint firstItem="IO9-EJ-mU5" firstAttribute="leading" secondItem="A4Q-jt-6W1" secondAttribute="trailing" constant="8" id="gnK-M7-sxR"/>
-                        <constraint firstItem="A4Q-jt-6W1" firstAttribute="leading" secondItem="M7b-ct-fs6" secondAttribute="leading" constant="8" id="lF6-uc-SOL"/>
-                    </constraints>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="M7b-ct-fs6" customClass="ComponentNavBarItem" customModule="KMComponentLibrary">
+                    <rect key="frame" x="16" y="0.0" width="279" height="32"/>
                 </customView>
             </subviews>
             <constraints>
-                <constraint firstItem="M7b-ct-fs6" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="8" id="Jlq-YJ-Lnv"/>
+                <constraint firstItem="M7b-ct-fs6" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="16" id="Jlq-YJ-Lnv"/>
                 <constraint firstItem="M7b-ct-fs6" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="Nd5-W6-jNb"/>
                 <constraint firstAttribute="bottom" secondItem="M7b-ct-fs6" secondAttribute="bottom" id="Rcs-41-ox8"/>
-                <constraint firstAttribute="trailing" secondItem="M7b-ct-fs6" secondAttribute="trailing" constant="8" id="up3-WR-1rt"/>
+                <constraint firstAttribute="trailing" secondItem="M7b-ct-fs6" secondAttribute="trailing" constant="16" id="up3-WR-1rt"/>
             </constraints>
             <point key="canvasLocation" x="-361.5" y="96"/>
         </customView>

+ 3 - 2
PDF Office/PDF Master/KMClass/NewBatch/View/Choose/KMBatchSettingView.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 class KMBatchSettingView: BaseXibView {
     var currentView: KMBatchSettingItemView = KMBatchSettingItemView()
@@ -32,8 +33,8 @@ class KMBatchSettingView: BaseXibView {
     override func setup() {
         super.setup()
         
-        self.contentView.wantsLayer = true
-        self.contentView.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
+        self.wantsLayer = true
+        self.border(ComponentLibrary.shared.getComponentColorFromKey("colorBorder/divider"), 0.5)
         
         self.type = .convertPDF
     }

+ 8 - 57
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/KMBatchProcessingView.swift

@@ -6,24 +6,21 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
-class KMBatchProcessingView: NSView {
-    @IBOutlet var contentView: NSView!
-    
-    @IBOutlet weak var addBox: NSBox!
+class KMBatchProcessingView: BaseXibView {
     @IBOutlet weak var tableView: KMBatchProcessingTableView!
     @IBOutlet weak var selectedFilesView: KMBatchSelectedFilesView!
-    @IBOutlet weak var cleanButton: NSButton!
     
     var createFilePopover: NSPopover?
     var addVC: KMDesignSelect!
     
     weak var delegate: KMBatchProcessingViewDelegate?
-    var inputType: DataNavigationViewButtonActionType? {
+    var inputType: KMBatchCollectionViewType? {
         didSet {
             self.selectedFilesView.inputType = inputType
             self.tableView.inputType = inputType
-            if inputType == .ImageToPDF {
+            if inputType == .imageToPDF {
                 addVC.removeAllItems()
                 addVC.addItems(withObjectValues: ["Add Files", "Add Folder"])
             }
@@ -47,47 +44,7 @@ class KMBatchProcessingView: NSView {
         // Drawing code here.
     }
     
-    // MARK: 初始化
-    public required init?(coder decoder: NSCoder) {
-        super.init(coder: decoder)
-        initContentView()
-        setup()
-    }
-    
-    override init(frame frameRect: NSRect) {
-        super.init(frame: frameRect)
-        initContentView()
-        setup()
-    }
-    
-    private func initContentView() {
-        //绑定xib
-        let resource = NSNib(nibNamed: String(describing: self.classForCoder.self),
-                             bundle: Bundle(for: self.classForCoder.self))!
-        resource.instantiate(withOwner: self, topLevelObjects: nil)
-        addSubview(contentView)
-        contentView.translatesAutoresizingMaskIntoConstraints = false
-        NSLayoutConstraint.activate([
-            contentView.topAnchor.constraint(equalTo: topAnchor),
-            contentView.leftAnchor.constraint(equalTo: leftAnchor),
-            contentView.rightAnchor.constraint(equalTo: rightAnchor),
-            contentView.bottomAnchor.constraint(equalTo: bottomAnchor)])
-        contentView.updateConstraintsForSubtreeIfNeeded()
-    }
-    
-    func setup() {
-        addVC = KMDesignSelect.init(withType: .PopButton)
-        addBox.fillColor = .clear
-        addBox.contentView = addVC.view
-        addVC.removeAllItems()
-        addVC.addItems(withObjectValues: ["Add Files", "Add Folder", "Add Open Files"])
-        addVC.selectItem(at: 0)
-        addVC.popoverBehavior = .transient
-        addVC.delete = self
-        
-        self.cleanButton.wantsLayer = true
-        self.cleanButton.border()
-        
+    override func setup() {
         self.selectedFilesView.dragEnd = {[unowned self] (data) in
             self.inputData = data
         }
@@ -109,12 +66,6 @@ class KMBatchProcessingView: NSView {
             self.tableView.isHidden = true
         }
         
-        if self.tableView.data?.count != 0 {
-            self.cleanButton.isEnabled = true
-        } else {
-            self.cleanButton.isEnabled = false
-        }
-        
         self.tableView.reloadData()
     }
 }
@@ -140,7 +91,7 @@ extension KMBatchProcessingView: KMBatchProcessingViewAction {
         KMBatchProcessingView.openfiles(window: window!) { [unowned self] openPanel in
             if self.inputType == .OCR {
                 openPanel.allowedFileTypes = KMOCRModel.supportedTypes()
-            } else if self.inputType == .ImageToPDF {
+            } else if self.inputType == .imageToPDF {
                 openPanel.allowedFileTypes = KMBatchProcessingTableViewModel.supportedImageTypes()
             } else {
                 openPanel.allowedFileTypes = KMOCRModel.supportedTypes()
@@ -167,7 +118,7 @@ extension KMBatchProcessingView: KMBatchProcessingViewAction {
         KMBatchProcessingView.openfiles(window: window!) { [unowned self] openPanel in
             if self.inputType == .OCR {
                 openPanel.allowedFileTypes = KMOCRModel.supportedTypes()
-            } else if self.inputType == .ImageToPDF {
+            } else if self.inputType == .imageToPDF {
                 openPanel.allowedFileTypes = KMBatchProcessingTableViewModel.supportedImageTypes()
             } else {
                 openPanel.allowedFileTypes = KMOCRModel.supportedTypes()
@@ -184,7 +135,7 @@ extension KMBatchProcessingView: KMBatchProcessingViewAction {
                 var types: [String] = []
                 if self.inputType == .OCR {
                     types = KMOCRModel.supportedTypes()
-                } else if self.inputType == .ImageToPDF {
+                } else if self.inputType == .imageToPDF {
                     types = KMBatchProcessingTableViewModel.supportedImageTypes()
                 } else {
                     types = KMOCRModel.supportedTypes()

+ 15 - 61
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/KMBatchProcessingView.xib

@@ -8,8 +8,6 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
-                <outlet property="addBox" destination="CFL-oP-esw" id="EUt-9H-7zF"/>
-                <outlet property="cleanButton" destination="ZW9-hb-VaF" id="5kP-QY-Dep"/>
                 <outlet property="contentView" destination="c22-O7-iKe" id="Fy0-yD-EFd"/>
                 <outlet property="selectedFilesView" destination="Btb-75-0Y1" id="UsJ-q1-h2h"/>
                 <outlet property="tableView" destination="OMY-wn-4ox" id="fPx-xC-NN0"/>
@@ -18,11 +16,11 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="632" height="628"/>
+            <rect key="frame" x="0.0" y="0.0" width="632" height="576"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="GnF-d1-s3v">
-                    <rect key="frame" x="0.0" y="52" width="632" height="576"/>
+                    <rect key="frame" x="0.0" y="0.0" width="632" height="576"/>
                     <subviews>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="OMY-wn-4ox" customClass="KMBatchProcessingTableView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="632" height="576"/>
@@ -32,68 +30,24 @@
                         </customView>
                     </subviews>
                     <constraints>
-                        <constraint firstItem="OMY-wn-4ox" firstAttribute="leading" secondItem="GnF-d1-s3v" secondAttribute="leading" id="2w7-zD-V8e"/>
-                        <constraint firstItem="Btb-75-0Y1" firstAttribute="top" secondItem="GnF-d1-s3v" secondAttribute="top" id="4Uw-zn-3wj"/>
-                        <constraint firstItem="Btb-75-0Y1" firstAttribute="leading" secondItem="GnF-d1-s3v" secondAttribute="leading" id="DEO-9k-xQu"/>
-                        <constraint firstAttribute="trailing" secondItem="Btb-75-0Y1" secondAttribute="trailing" id="RcT-sB-RCq"/>
-                        <constraint firstAttribute="bottom" secondItem="OMY-wn-4ox" secondAttribute="bottom" id="TPS-w4-KNC"/>
-                        <constraint firstItem="OMY-wn-4ox" firstAttribute="top" secondItem="GnF-d1-s3v" secondAttribute="top" id="fye-I1-Rwh"/>
-                        <constraint firstAttribute="bottom" secondItem="Btb-75-0Y1" secondAttribute="bottom" id="gng-A1-fEu"/>
-                        <constraint firstAttribute="trailing" secondItem="OMY-wn-4ox" secondAttribute="trailing" id="kVO-fM-Hny"/>
-                    </constraints>
-                </customView>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ucf-BJ-rtF">
-                    <rect key="frame" x="0.0" y="0.0" width="632" height="52"/>
-                    <subviews>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZW9-hb-VaF">
-                            <rect key="frame" x="584" y="10" width="32" height="32"/>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="icon_btn_clear_norm_false" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="ym9-ds-X7L">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="32" id="csb-7H-Da8"/>
-                                <constraint firstAttribute="height" constant="32" id="njF-m1-vms"/>
-                            </constraints>
-                            <connections>
-                                <action selector="cleanAll:" target="-2" id="qHw-Qd-YQ6"/>
-                            </connections>
-                        </button>
-                        <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="CFL-oP-esw">
-                            <rect key="frame" x="16" y="16" width="117" height="32"/>
-                            <view key="contentView" id="Hlh-Xg-2Kw">
-                                <rect key="frame" x="0.0" y="0.0" width="117" height="32"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            </view>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="117" id="LhB-yx-0g2"/>
-                                <constraint firstAttribute="height" constant="32" id="Thk-TI-ld5"/>
-                            </constraints>
-                            <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </box>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="CFL-oP-esw" firstAttribute="leading" secondItem="Ucf-BJ-rtF" secondAttribute="leading" constant="16" id="6UD-uF-q2B"/>
-                        <constraint firstItem="ZW9-hb-VaF" firstAttribute="centerY" secondItem="Ucf-BJ-rtF" secondAttribute="centerY" id="6c3-Mh-hxP"/>
-                        <constraint firstAttribute="bottom" secondItem="CFL-oP-esw" secondAttribute="bottom" constant="16" id="QKc-aN-gqM"/>
-                        <constraint firstAttribute="trailing" secondItem="ZW9-hb-VaF" secondAttribute="trailing" constant="16" id="Zn7-Jr-0pu"/>
-                        <constraint firstAttribute="height" constant="52" id="ml0-wK-1zH"/>
+                        <constraint firstItem="Btb-75-0Y1" firstAttribute="top" secondItem="GnF-d1-s3v" secondAttribute="top" id="6ql-PV-cJz"/>
+                        <constraint firstAttribute="bottom" secondItem="Btb-75-0Y1" secondAttribute="bottom" id="7gA-Qb-6Gm"/>
+                        <constraint firstAttribute="bottom" secondItem="OMY-wn-4ox" secondAttribute="bottom" id="Jf0-JU-d65"/>
+                        <constraint firstAttribute="trailing" secondItem="Btb-75-0Y1" secondAttribute="trailing" id="b2C-lc-ahC"/>
+                        <constraint firstItem="OMY-wn-4ox" firstAttribute="leading" secondItem="GnF-d1-s3v" secondAttribute="leading" id="bAF-KF-j1m"/>
+                        <constraint firstItem="Btb-75-0Y1" firstAttribute="leading" secondItem="GnF-d1-s3v" secondAttribute="leading" id="qHK-82-KSu"/>
+                        <constraint firstItem="OMY-wn-4ox" firstAttribute="top" secondItem="GnF-d1-s3v" secondAttribute="top" id="qTZ-2E-ltd"/>
+                        <constraint firstAttribute="trailing" secondItem="OMY-wn-4ox" secondAttribute="trailing" id="rkJ-fv-neo"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="Ucf-BJ-rtF" secondAttribute="trailing" id="2TU-gQ-aEZ"/>
-                <constraint firstAttribute="trailing" secondItem="GnF-d1-s3v" secondAttribute="trailing" id="7DB-b0-pWq"/>
-                <constraint firstItem="GnF-d1-s3v" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="Tl8-bb-ncT"/>
-                <constraint firstItem="Ucf-BJ-rtF" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="ZYs-zC-oi3"/>
-                <constraint firstItem="GnF-d1-s3v" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="bAc-gW-qCK"/>
-                <constraint firstItem="Ucf-BJ-rtF" firstAttribute="top" secondItem="GnF-d1-s3v" secondAttribute="bottom" id="jT0-hc-Rzy"/>
-                <constraint firstAttribute="bottom" secondItem="Ucf-BJ-rtF" secondAttribute="bottom" id="xpi-cf-aZu"/>
+                <constraint firstItem="GnF-d1-s3v" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="Cp8-Yj-ZRC"/>
+                <constraint firstAttribute="bottom" secondItem="GnF-d1-s3v" secondAttribute="bottom" id="Dpe-Rb-qbn"/>
+                <constraint firstAttribute="trailing" secondItem="GnF-d1-s3v" secondAttribute="trailing" id="J6e-ju-lnZ"/>
+                <constraint firstItem="GnF-d1-s3v" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="S8C-GS-y9W"/>
             </constraints>
-            <point key="canvasLocation" x="-452" y="47"/>
+            <point key="canvasLocation" x="-452" y="21"/>
         </customView>
     </objects>
-    <resources>
-        <image name="icon_btn_clear_norm_false" width="16" height="16"/>
-    </resources>
 </document>

+ 3 - 3
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/SelectedFiles/KMBatchSelectedFilesView.swift

@@ -15,7 +15,7 @@ class KMBatchSelectedFilesView: BaseXibView {
     @IBOutlet weak var subtitleLabel: NSTextField!
     @IBOutlet weak var box: KMBox!
     
-    var inputType: DataNavigationViewButtonActionType?
+    var inputType: KMBatchCollectionViewType?
     var data: [URL] = []
     var dragEnd: KMBatchSelectedFilesViewCompletion?
     var addAction: KMBatchSelectedFilesViewAddFilesAction?
@@ -124,11 +124,11 @@ extension KMBatchSelectedFilesView: KMBatchSelectedFilesViewDrag {
                 let url = NSURL(string: string)
                 
                 switch self.inputType {
-                case .OCR,.Batch:
+                case .OCR,.batchRemove:
                     if (url?.pathExtension?.lowercased() == "pdf") {
                         array.append(url! as URL)
                     }
-                case .ImageToPDF:
+                case .imageToPDF:
                     if (KMBatchProcessingTableViewModel.supportedImageTypes().contains((url?.pathExtension?.lowercased())!)) {
                         array.append(url! as URL)
                     }

+ 11 - 10
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/SelectedFiles/KMBatchSelectedFilesView.xib

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <deployment identifier="macosx"/>
+        <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="KMBatchSelectedFilesView" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchSelectedFilesView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="box" destination="y5i-wB-Qel" id="ZZN-sE-YKB"/>
                 <outlet property="imageButton" destination="STJ-AT-hZ8" id="zQz-NR-i0B"/>
@@ -22,7 +23,7 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ibq-pW-6fR">
                     <rect key="frame" x="62" y="136" width="418" height="200"/>
                     <subviews>
-                        <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="y5i-wB-Qel" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                        <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="y5i-wB-Qel" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                             <rect key="frame" x="145" y="72" width="128" height="128"/>
                             <view key="contentView" id="aGb-yq-zUB">
                                 <rect key="frame" x="0.0" y="0.0" width="128" height="128"/>
@@ -35,19 +36,19 @@
                         </box>
                         <button translatesAutoresizingMaskIntoConstraints="NO" id="STJ-AT-hZ8">
                             <rect key="frame" x="145" y="72" width="128" height="128"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="128" id="FPo-kq-4aa"/>
-                                <constraint firstAttribute="width" constant="128" id="SOe-q0-XB4"/>
-                            </constraints>
                             <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="icon_empty_add_norm" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="6la-3i-h0B">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="128" id="FPo-kq-4aa"/>
+                                <constraint firstAttribute="width" constant="128" id="SOe-q0-XB4"/>
+                            </constraints>
                             <connections>
                                 <action selector="selectFilse:" target="-2" id="Af0-zo-h0U"/>
                             </connections>
                         </button>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sAL-Vd-XZZ">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sAL-Vd-XZZ">
                             <rect key="frame" x="166" y="42" width="86" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="ZBC-vg-gHp"/>
@@ -58,7 +59,7 @@
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                         </textField>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zH4-UK-9qG">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zH4-UK-9qG">
                             <rect key="frame" x="14" y="0.0" width="390" height="40"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="aPR-g2-3cm"/>

+ 31 - 18
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableView.swift

@@ -19,7 +19,7 @@ class KMBatchProcessingTableView: NSView {
     weak var delegate: KMBatchProcessingTableViewDelegate?
 
     var selectModels: [KMBatchProcessingTableViewModel] = []
-    var inputType: DataNavigationViewButtonActionType? {
+    var inputType: KMBatchCollectionViewType? {
         didSet {
             self.reloadData()
         }
@@ -92,13 +92,24 @@ class KMBatchProcessingTableView: NSView {
             self.tableView.removeTableColumn(self.tableView.tableColumns[0])
         }
         
+        if (options!.contains(KMBatchProcessingTableViewOptions.number)) {
+            let column = NSTableColumn()
+            column.headerCell = KMBatchProcessingColumnHeaderCell.init()
+            column.title = NSLocalizedString("  ", comment: "")
+            column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.number.rawValue))
+//            column.resizingMask = .userResizingMask
+            column.width = 40
+            
+            self.tableView.addTableColumn(column)
+        }
+        
         if (options!.contains(KMBatchProcessingTableViewOptions.name)) {
             let column = NSTableColumn()
             column.headerCell = KMBatchProcessingColumnHeaderCell.init()
             column.title = NSLocalizedString("File Name", comment: "")
             column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.name.rawValue))
 //            column.resizingMask = .userResizingMask
-            column.width = self.canShowOrder() ? 218 : 600
+            column.width = self.canShowOrder() ? 180 : 600
             
             self.tableView.addTableColumn(column)
         }
@@ -109,7 +120,7 @@ class KMBatchProcessingTableView: NSView {
             column.title = NSLocalizedString("Page Range", comment: "")
             column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.order.rawValue))
             column.resizingMask = .userResizingMask
-            column.width = 156
+            column.width = 164
             self.tableView.addTableColumn(column)
         }
         
@@ -119,7 +130,7 @@ class KMBatchProcessingTableView: NSView {
             column.title = NSLocalizedString("Size", comment: "")
             column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.size.rawValue))
             column.resizingMask = .userResizingMask
-            column.width = 90
+            column.width = 88
             self.tableView.addTableColumn(column)
         }
         
@@ -130,27 +141,27 @@ class KMBatchProcessingTableView: NSView {
             column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.state.rawValue))
             column.headerCell.textColor = NSColor.red
             column.resizingMask = .userResizingMask
-            column.width = 90
+            column.width = 56
             self.tableView.addTableColumn(column)
         }
         
-        if (options!.contains(KMBatchProcessingTableViewOptions.delete)) {
-            let column = NSTableColumn()
-            column.headerCell = KMBatchProcessingColumnHeaderCell.init()
-            column.title = NSLocalizedString("", comment: "")
-            column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.delete.rawValue))
-            column.resizingMask = .userResizingMask
-            column.width = 30
-            self.tableView.addTableColumn(column)
-        }
+//        if (options!.contains(KMBatchProcessingTableViewOptions.delete)) {
+//            let column = NSTableColumn()
+//            column.headerCell = KMBatchProcessingColumnHeaderCell.init()
+//            column.title = NSLocalizedString("", comment: "")
+//            column.identifier = NSUserInterfaceItemIdentifier(String(KMBatchProcessingTableViewOptions.delete.rawValue))
+//            column.resizingMask = .userResizingMask
+//            column.width = 30
+//            self.tableView.addTableColumn(column)
+//        }
         
         self.tableView.reloadData()
     }
     
     func canShowOrder() -> Bool {
-        if (self.inputType != .ImageToPDF &&
-            self.inputType != .Security &&
-            self.inputType != .Compression) {
+        if (self.inputType != .imageToPDF &&
+            self.inputType != .security &&
+            self.inputType != .compress) {
             return true
         } else {
             return false
@@ -166,7 +177,9 @@ extension KMBatchProcessingTableView: NSTableViewDelegate {
     
     func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
         var cell: KMBatchProcessingTableCell?
-        if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.name.rawValue)) {
+        if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.number.rawValue)) {
+            cell = KMBatchProcessingNumTableCell.init(frame: CGRect(x: 0, y: 0, width: tableColumn!.width, height:tableView.rowHeight))
+        } else if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.name.rawValue)) {
             cell = KMBatchProcessingNameTableCell.init(frame: CGRect(x: 0, y: 0, width: tableColumn!.width, height:tableView.rowHeight))
         } else if (tableColumn?.identifier.rawValue == String(KMBatchProcessingTableViewOptions.order.rawValue)) {
             cell = KMBatchProcessingOrderTableCell.init(frame: CGRect(x: 0, y: 0, width: tableColumn!.width, height:tableView.rowHeight))

+ 15 - 14
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableView.xib

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <deployment identifier="macosx"/>
+        <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="KMBatchProcessingTableView" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingTableView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="B0n-CN-hq3"/>
                 <outlet property="tableView" destination="iF7-ag-gLW" id="zPn-P7-7Gb"/>
@@ -18,13 +19,13 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LBT-Yb-LH6">
-                    <rect key="frame" x="0.0" y="0.0" width="747" height="467"/>
+                    <rect key="frame" x="24" y="0.0" width="699" height="467"/>
                     <clipView key="contentView" drawsBackground="NO" id="Ukp-eK-M2w">
-                        <rect key="frame" x="0.0" y="0.0" width="747" height="467"/>
+                        <rect key="frame" x="0.0" y="0.0" width="699" height="467"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnSelection="YES" autosaveColumns="NO" rowHeight="24" headerView="5ix-cJ-akY" viewBased="YES" id="iF7-ag-gLW">
-                                <rect key="frame" x="0.0" y="0.0" width="747" height="439"/>
+                                <rect key="frame" x="0.0" y="0.0" width="699" height="439"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="gridColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -45,7 +46,7 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="122" height="52"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P6z-J9-emW">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P6z-J9-emW">
                                                         <rect key="frame" x="0.0" y="18" width="122" height="16"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="LAJ-A9-nWF">
@@ -61,7 +62,7 @@
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
-                                    <tableColumn identifier="AutomaticTableColumnIdentifier.1" width="619" minWidth="40" maxWidth="1000" id="5A0-s0-Kc3">
+                                    <tableColumn identifier="AutomaticTableColumnIdentifier.1" width="571" minWidth="40" maxWidth="1000" id="5A0-s0-Kc3">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -74,11 +75,11 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView id="wPA-2x-vh6">
-                                                <rect key="frame" x="122" y="0.0" width="625" height="52"/>
+                                                <rect key="frame" x="122" y="0.0" width="577" height="52"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zlk-wC-1F0">
-                                                        <rect key="frame" x="0.0" y="18" width="625" height="16"/>
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zlk-wC-1F0">
+                                                        <rect key="frame" x="0.0" y="18" width="577" height="16"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Q2c-3b-6dl">
                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -107,15 +108,15 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" wantsLayer="YES" id="5ix-cJ-akY">
-                        <rect key="frame" x="0.0" y="0.0" width="747" height="28"/>
+                        <rect key="frame" x="0.0" y="0.0" width="699" height="28"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="LBT-Yb-LH6" secondAttribute="trailing" id="6WO-Js-I7C"/>
+                <constraint firstAttribute="trailing" secondItem="LBT-Yb-LH6" secondAttribute="trailing" constant="24" id="6WO-Js-I7C"/>
                 <constraint firstAttribute="bottom" secondItem="LBT-Yb-LH6" secondAttribute="bottom" id="AgW-17-Vjg"/>
-                <constraint firstItem="LBT-Yb-LH6" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="VOh-HO-hTl"/>
+                <constraint firstItem="LBT-Yb-LH6" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="24" id="VOh-HO-hTl"/>
                 <constraint firstItem="LBT-Yb-LH6" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="yUL-CH-XPw"/>
             </constraints>
             <point key="canvasLocation" x="272.5" y="251.5"/>

+ 7 - 6
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/KMBatchProcessingTableViewModel/KMBatchProcessingTableViewModel.swift

@@ -13,13 +13,14 @@ import Cocoa
 struct KMBatchProcessingTableViewOptions: OptionSet {
     let rawValue: Int
     
-    static let name = KMBatchProcessingTableViewOptions(rawValue: 1 << 0)
-    static let size = KMBatchProcessingTableViewOptions(rawValue: 1 << 1)
-    static let order = KMBatchProcessingTableViewOptions(rawValue: 1 << 2)
-    static let state = KMBatchProcessingTableViewOptions(rawValue: 1 << 3)
-    static let delete = KMBatchProcessingTableViewOptions(rawValue: 1 << 4)
+    static let number = KMBatchProcessingTableViewOptions(rawValue: 1 << 0)
+    static let name = KMBatchProcessingTableViewOptions(rawValue: 1 << 1)
+    static let size = KMBatchProcessingTableViewOptions(rawValue: 1 << 2)
+    static let order = KMBatchProcessingTableViewOptions(rawValue: 1 << 3)
+    static let state = KMBatchProcessingTableViewOptions(rawValue: 1 << 4)
+    static let delete = KMBatchProcessingTableViewOptions(rawValue: 1 << 5)
     
-    static let all: KMBatchProcessingTableViewOptions = [.name, .size, .order, .state, .delete]
+    static let all: KMBatchProcessingTableViewOptions = [.number,.name, .size, .order, .state, .delete]
 }
 
 enum KMBatchProcessingTableFileState: String, CaseIterable {

+ 4 - 3
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingColumnHeaderCell.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 class KMBatchProcessingColumnHeaderCell: NSTableHeaderCell {
     
@@ -22,7 +23,7 @@ class KMBatchProcessingColumnHeaderCell: NSTableHeaderCell {
     }
     
     func draw(frame: CGRect, highlight: Bool) {
-        NSColor.white.withAlphaComponent(1).setFill()
+        ComponentLibrary.shared.backgroundColor(forToken: "colorFill/4")?.withAlphaComponent(1).setFill()
         let path = NSBezierPath(roundedRect: frame, xRadius: 0, yRadius: 0)
         path.fill()
         
@@ -34,8 +35,8 @@ class KMBatchProcessingColumnHeaderCell: NSTableHeaderCell {
         titleRect.origin.x += 24
         titleRect.origin.y += 8
         
-        let attributes = [NSAttributedString.Key.foregroundColor: NSColor.km_init(hex: "#616469"),
-                          NSAttributedString.Key.font: NSFont.SFProTextSemiboldFont(12.0)]
+        let attributes = [NSAttributedString.Key.foregroundColor: ComponentLibrary.shared.getComponentColorFromKey("colorText/1"),
+                          NSAttributedString.Key.font: ComponentLibrary.shared.font(forToken: "mac/body-s-medium")]
         
         
         let attributedString = NSAttributedString(string: self.attributedStringValue.string, attributes: attributes)

+ 7 - 7
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingDeleteTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" 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="21507"/>
+        <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="KMBatchProcessingDeleteTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingDeleteTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="GUs-qS-kbl"/>
                 <outlet property="deleteButton" destination="V6R-Z5-vrK" id="cE2-I8-tJE"/>
@@ -20,14 +20,14 @@
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="V6R-Z5-vrK">
                     <rect key="frame" x="0.0" y="11" width="20" height="20"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="20" id="do1-q7-e3j"/>
-                        <constraint firstAttribute="height" constant="20" id="uWh-N9-uV0"/>
-                    </constraints>
                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="icon_btn_close-fill" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="fYz-tt-WAC">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="20" id="do1-q7-e3j"/>
+                        <constraint firstAttribute="height" constant="20" id="uWh-N9-uV0"/>
+                    </constraints>
                     <connections>
                         <action selector="deleteAction:" target="-2" id="KJI-GM-pUT"/>
                     </connections>

+ 4 - 4
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNameTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" 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="21507"/>
+        <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="KMBatchProcessingNameTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingNameTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="H1z-Vy-z59"/>
                 <outlet property="iconImageView" destination="f0z-1i-ekg" id="br7-04-TKL"/>
@@ -27,7 +27,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="d8O-hm-Icc"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9BP-LK-TK6">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9BP-LK-TK6">
                     <rect key="frame" x="38" y="10" width="71" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="H0s-Nl-EiE"/>

+ 59 - 0
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNumTableCell.swift

@@ -0,0 +1,59 @@
+//
+//  KMBatchProcessingNumTableCell.swift
+//  PDF Reader Pro
+//
+//  Created by lizhe on 2025/1/6.
+//
+
+import Cocoa
+import KMComponentLibrary
+
+class KMBatchProcessingNumTableCell: KMBatchProcessingTableCell {
+    @IBOutlet var contentView: NSView!
+    
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+
+        // Drawing code here.
+    }
+    
+    // MARK: 初始化
+    override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+        initContentView()
+        setup()
+    }
+    
+    required init?(coder decoder: NSCoder) {
+        super.init(coder: decoder)
+        initContentView()
+        setup()
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func initContentView() {
+        //绑定xib
+        let resource = NSNib(nibNamed: String(describing: self.classForCoder.self),
+                             bundle: Bundle(for: self.classForCoder.self))!
+        resource.instantiate(withOwner: self, topLevelObjects: nil)
+        addSubview(contentView)
+        contentView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            contentView.topAnchor.constraint(equalTo: topAnchor),
+            contentView.leftAnchor.constraint(equalTo: leftAnchor),
+            contentView.rightAnchor.constraint(equalTo: rightAnchor),
+            contentView.bottomAnchor.constraint(equalTo: bottomAnchor)])
+        contentView.updateConstraintsForSubtreeIfNeeded()
+    }
+    
+    override func setup() {
+        super.setup()
+
+        
+    }
+    
+    
+    override func reloadData() {
+
+    }
+}

+ 22 - 0
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingNumTableCell.xib

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="22505"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingNumTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
+            <connections>
+                <outlet property="contentView" destination="c22-O7-iKe" id="6xH-n9-3Uv"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <point key="canvasLocation" x="139" y="154"/>
+        </customView>
+    </objects>
+</document>

+ 4 - 4
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingOrderTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" 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="21507"/>
+        <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="KMBatchProcessingOrderTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingOrderTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="r5V-UN-Rjs"/>
                 <outlet property="orderButton" destination="unP-k5-IOp" id="RAU-Wd-5C8"/>
@@ -18,7 +18,7 @@
             <rect key="frame" x="0.0" y="0.0" width="160" height="40"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="unP-k5-IOp" customClass="KMTextfieldButton" customModule="PDF_Office" customModuleProvider="target">
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="unP-k5-IOp" customClass="KMTextfieldButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                     <rect key="frame" x="24" y="8" width="150" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="150" id="Gy1-6w-3Qo"/>

+ 4 - 4
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingSizeTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" 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="21507"/>
+        <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="KMBatchProcessingSizeTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingSizeTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="3sD-la-SLK"/>
                 <outlet property="sizeLabel" destination="TB8-4t-Uyp" id="P0e-uJ-KcR"/>
@@ -18,7 +18,7 @@
             <rect key="frame" x="0.0" y="0.0" width="204" height="40"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TB8-4t-Uyp">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TB8-4t-Uyp">
                     <rect key="frame" x="22" y="10" width="37" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="xEL-E8-K7R"/>

+ 3 - 3
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingStateTableCell.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" 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="21507"/>
+        <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="KMBatchProcessingStateTableCell" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchProcessingStateTableCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="contentView" destination="c22-O7-iKe" id="2hP-ym-f8D"/>
                 <outlet property="iconImageView" destination="SmF-pN-hLc" id="A3x-QC-u3T"/>

+ 11 - 10
PDF Office/PDF Master/KMClass/NewBatch/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingTableRowView.swift

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import KMComponentLibrary
 
 typealias KMBatchProcessingTableRowViewHoverCallback = (_ mouseEntered: Bool, _ mouseBox: KMBox) -> Void
 typealias KMBatchProcessingTableRowViewMouseDownCallback = (_ mouseEntered: Bool, _ mouseBox: KMBox) -> Void
@@ -28,18 +29,18 @@ class KMBatchProcessingTableRowView: NSTableRowView {
     
     func addBox() {
         var rect = self.bounds
-        rect.origin.x = self.bounds.origin.x + 16.0
+        rect.origin.x = self.bounds.origin.x
         rect.origin.y = self.bounds.origin.y + 2
         rect.size.height = self.bounds.size.height - 4
-        rect.size.width = self.bounds.size.width - 32.0
+        rect.size.width = self.bounds.size.width
         
         if self.box == nil {
             
             self.box?.wantsLayer = true
             self.box = KMBox(frame: rect)
-            self.box?.borderWidth = 1
+            self.box?.borderWidth = 0
             self.box?.borderColor = NSColor.km_init(hex: "#CED0D4")
-            self.box?.layer?.cornerRadius = 4
+            self.box?.layer?.cornerRadius = 0
             self.box?.boxType = .custom
             self.addSubview(self.box!, positioned: NSWindow.OrderingMode.below, relativeTo: self)
             self.box?.moveCallback = { [unowned self] (mouseEntered, mouseBox) in
@@ -89,13 +90,13 @@ class KMBatchProcessingTableRowView: NSTableRowView {
     
     func drawView(_ color: NSColor = NSColor.km_init(hex: "#CED0D4", alpha: 0.6)) {
         if model.select {
-            self.box?.backgroundColor(NSColor.km_init(hex: "#CED0D4", alpha: 0.6))
-            self.box?.borderWidth = 1
-            self.box?.layer?.cornerRadius = 4
+            self.box?.backgroundColor(ComponentLibrary.shared.getComponentColorFromKey("colorFill/hight"))
+            self.box?.borderWidth = 0
+            self.box?.layer?.cornerRadius = 0
         } else if model.hover {
-            self.box?.backgroundColor(NSColor.km_init(hex: "#EDEEF0"))
-            self.box?.borderWidth = 1
-            self.box?.layer?.cornerRadius = 4
+            self.box?.backgroundColor(ComponentLibrary.shared.getComponentColorFromKey("colorPrimary/bg-active"))
+            self.box?.borderWidth = 0
+            self.box?.layer?.cornerRadius = 0
         } else {
             self.box?.backgroundColor(NSColor.clear)
             self.box?.borderWidth = 0

+ 28 - 12
PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -1571,6 +1571,12 @@
 		AD8B5A142D2B778D00150EA6 /* KMBatchProcessingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B59D72D2B778D00150EA6 /* KMBatchProcessingView.xib */; };
 		AD8B5A152D2B778D00150EA6 /* KMBatchProcessingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B59D72D2B778D00150EA6 /* KMBatchProcessingView.xib */; };
 		AD8B5A162D2B778D00150EA6 /* KMBatchProcessingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B59D72D2B778D00150EA6 /* KMBatchProcessingView.xib */; };
+		AD8B5A1C2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */; };
+		AD8B5A1D2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */; };
+		AD8B5A1E2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */; };
+		AD8B5A202D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */; };
+		AD8B5A212D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */; };
+		AD8B5A222D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */; };
 		AD8DD2A32A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8DD2A22A9C35B2007CC9D0 /* KMThumbnailManager.swift */; };
 		AD8DD2A42A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8DD2A22A9C35B2007CC9D0 /* KMThumbnailManager.swift */; };
 		AD8DD2A52A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD8DD2A22A9C35B2007CC9D0 /* KMThumbnailManager.swift */; };
@@ -5291,6 +5297,8 @@
 		AD8B59D52D2B778D00150EA6 /* KMBatchSelectedFilesView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMBatchSelectedFilesView.xib; sourceTree = "<group>"; };
 		AD8B59D62D2B778D00150EA6 /* KMBatchProcessingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMBatchProcessingView.swift; sourceTree = "<group>"; };
 		AD8B59D72D2B778D00150EA6 /* KMBatchProcessingView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMBatchProcessingView.xib; sourceTree = "<group>"; };
+		AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchProcessingNumTableCell.swift; sourceTree = "<group>"; };
+		AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatchProcessingNumTableCell.xib; sourceTree = "<group>"; };
 		AD8DD2A22A9C35B2007CC9D0 /* KMThumbnailManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMThumbnailManager.swift; sourceTree = "<group>"; };
 		AD8E48982D153D200055D3E6 /* KMOCRModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMOCRModel.swift; sourceTree = "<group>"; };
 		AD8E489C2D1542510055D3E6 /* KMOCRAreaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMOCRAreaView.swift; sourceTree = "<group>"; };
@@ -8654,10 +8662,10 @@
 		AD8B59BC2D2B778D00150EA6 /* Tableview */ = {
 			isa = PBXGroup;
 			children = (
+				AD8B59C22D2B778D00150EA6 /* KMBatchProcessingTableView.swift */,
+				AD8B59C12D2B778D00150EA6 /* KMBatchProcessingTableView.xib */,
 				AD8B59BD2D2B778D00150EA6 /* Presenter */,
 				AD8B59BF2D2B778D00150EA6 /* KMBatchProcessingTableViewModel */,
-				AD8B59C12D2B778D00150EA6 /* KMBatchProcessingTableView.xib */,
-				AD8B59C22D2B778D00150EA6 /* KMBatchProcessingTableView.swift */,
 				AD8B59C32D2B778D00150EA6 /* Views */,
 			);
 			path = Tableview;
@@ -8698,19 +8706,21 @@
 		AD8B59C52D2B778D00150EA6 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				AD8B59C62D2B778D00150EA6 /* KMBatchProcessingStateTableCell.xib */,
-				AD8B59C72D2B778D00150EA6 /* KMBatchProcessingStateTableCell.swift */,
+				AD8B59D02D2B778D00150EA6 /* KMBatchProcessingColumnHeaderCell.swift */,
+				AD8B59D22D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.swift */,
+				AD8B59CE2D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.xib */,
+				AD8B59D12D2B778D00150EA6 /* KMBatchProcessingNameTableCell.swift */,
+				AD8B59CC2D2B778D00150EA6 /* KMBatchProcessingNameTableCell.xib */,
+				AD8B5A1B2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift */,
+				AD8B5A1F2D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib */,
+				AD8B59CB2D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.swift */,
 				AD8B59C82D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.xib */,
-				AD8B59C92D2B778D00150EA6 /* KMBatchProcessingTableRowView.swift */,
+				AD8B59CF2D2B778D00150EA6 /* KMBatchProcessingSizeTableCell.swift */,
 				AD8B59CA2D2B778D00150EA6 /* KMBatchProcessingSizeTableCell.xib */,
-				AD8B59CB2D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.swift */,
-				AD8B59CC2D2B778D00150EA6 /* KMBatchProcessingNameTableCell.xib */,
+				AD8B59C72D2B778D00150EA6 /* KMBatchProcessingStateTableCell.swift */,
+				AD8B59C62D2B778D00150EA6 /* KMBatchProcessingStateTableCell.xib */,
 				AD8B59CD2D2B778D00150EA6 /* KMBatchProcessingTableCell.swift */,
-				AD8B59CE2D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.xib */,
-				AD8B59CF2D2B778D00150EA6 /* KMBatchProcessingSizeTableCell.swift */,
-				AD8B59D02D2B778D00150EA6 /* KMBatchProcessingColumnHeaderCell.swift */,
-				AD8B59D12D2B778D00150EA6 /* KMBatchProcessingNameTableCell.swift */,
-				AD8B59D22D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.swift */,
+				AD8B59C92D2B778D00150EA6 /* KMBatchProcessingTableRowView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -13098,6 +13108,7 @@
 				AD8B59EA2D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.xib in Resources */,
 				BB5A9D4F2CB6521400F64C1F /* SettingsWindowController.xib in Resources */,
 				BB1B0AE02B4FC6E900889528 /* KMOpenFileGuidePanel.xib in Resources */,
+				AD8B5A202D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */,
 				ADBC373729CA975B00D93208 /* KMCompatative.xcassets in Resources */,
 				F35BC6CC2CA3AD710022CDE9 /* Shaders.bundle in Resources */,
 				ADAFDA102AE8DD6600F084BC /* KMAdvertisementCollectionHeadView.xib in Resources */,
@@ -13682,6 +13693,7 @@
 				BB03D6A12B024AC8008C9976 /* KMPDFEditInsertPageWindow.xib in Resources */,
 				BBA19F3729ADACC5001A285A /* signPicture_nor.pdf in Resources */,
 				BB8AA5402CC66E490084F183 /* PDFImages.xcassets in Resources */,
+				AD8B5A212D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */,
 				AD8B59F72D2B778D00150EA6 /* KMBatchProcessingNameTableCell.xib in Resources */,
 				AD3AAD312B0B700500DE5FE7 /* KMCompareCoveringView.xib in Resources */,
 				BBE788CA2CBD2463008086E2 /* ListVC.xib in Resources */,
@@ -14135,6 +14147,7 @@
 				AD8B59EC2D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.xib in Resources */,
 				BB5A9D382CB6520100F64C1F /* KMHomeOpenView.xib in Resources */,
 				AD58F4072B14954B00299EE0 /* KMCompareTextHeaderView.xib in Resources */,
+				AD8B5A222D2BDE5200150EA6 /* KMBatchProcessingNumTableCell.xib in Resources */,
 				9F3BCDCA2CCB749400BDAB67 /* 快速教学.pdf in Resources */,
 				9FBA0F0329015A82001117AF /* KMFastToolCollectionViewItem.xib in Resources */,
 				BB6B49AB2D02A07B003ECD26 /* KMPDFSignatureDrawView.xib in Resources */,
@@ -15532,6 +15545,7 @@
 				AD055EB92B8843FD0035F824 /* SKToolbarItem.m in Sources */,
 				651A59832C8EA210005A35FB /* KMPurchaseEmbeddedWindowController.swift in Sources */,
 				AD055E812B88294F0035F824 /* SKBookmarkController.m in Sources */,
+				AD8B5A1C2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */,
 				ADE86AD12B04BAEA00414DFA /* KMCompareFilesView.swift in Sources */,
 				F3D5D2AF2CCCD86400D4F1D5 /* KMNThumbnailBaseViewController+Action.swift in Sources */,
 				9F1F82EA2935D02E0092C4B4 /* KMComboBox.swift in Sources */,
@@ -16410,6 +16424,7 @@
 				ADE3C1AC29A4779E00793B13 /* KMPrintAccessoryController.swift in Sources */,
 				AD07BCB32D02CBB20075054B /* KMCompressSettingModel.swift in Sources */,
 				651559232CCA6E3100C0F0D9 /* KMConvertPPTsWindowController.swift in Sources */,
+				AD8B5A1D2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */,
 				BB10FAF72AFE2C2900F18D65 /* KMNumberArrayFormatter.swift in Sources */,
 				BB1413692C69E6CA00BB8E35 /* KMURLConfigManager.swift in Sources */,
 				653647CC2CDCA5DE00CDB13E /* KMBatchOperateBaseWindowController.swift in Sources */,
@@ -17559,6 +17574,7 @@
 				656C1E302CD0745200295F82 /* KMConvertPageRangeSettingItemView.swift in Sources */,
 				ADAAC1662BD645DB001F2DA6 /* KMRecommondPopWindow.m in Sources */,
 				AD8B5A0A2D2B778D00150EA6 /* KMBatchProcessingDeleteTableCell.swift in Sources */,
+				AD8B5A1E2D2BDE4800150EA6 /* KMBatchProcessingNumTableCell.swift in Sources */,
 				9F02017B2A1B5C0300C9B673 /* KMAIServerConfig.swift in Sources */,
 				AD8B59F52D2B778D00150EA6 /* KMBatchProcessingOrderTableCell.swift in Sources */,
 				F39603E92CC641D2003C6F71 /* KMNThumbnailManager.swift in Sources */,

+ 105 - 0
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -15793,6 +15793,21 @@
                   endingLineNumber = "29"
                   offsetFromSymbolStart = "244">
                </Location>
+               <Location
+                  uuid = "64B27BD6-6BFD-402B-AB71-BDC116A54CE2 - ef8aabae22ad451"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #2 (PDF_Reader_Pro.KMRemovePasswordView) -&gt; () in PDF_Reader_Pro.KMRemovePasswordWindowController.windowDidLoad() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/RemovePassword/New/KMRemovePasswordWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "29"
+                  endingLineNumber = "29"
+                  offsetFromSymbolStart = "76">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -15931,6 +15946,21 @@
                   endingLineNumber = "25"
                   offsetFromSymbolStart = "636">
                </Location>
+               <Location
+                  uuid = "243CF690-2567-4007-A615-5BE15EAFDE07 - f12b42a881edb7e4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (PDF_Reader_Pro.KMRemovePasswordView, Swift.Array&lt;PDF_Reader_Pro.KMFileAttribute&gt;) -&gt; () in PDF_Reader_Pro.KMRemovePasswordWindowController.windowDidLoad() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/RemovePassword/New/KMRemovePasswordWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "25"
+                  endingLineNumber = "25"
+                  offsetFromSymbolStart = "68">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -18845,6 +18875,21 @@
                   endingLineNumber = "239"
                   offsetFromSymbolStart = "144">
                </Location>
+               <Location
+                  uuid = "19635542-575C-4FC6-A9C4-10B83FD80C0F - a56cf30ab1badafb"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.commandDispatch(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "238"
+                  endingLineNumber = "238"
+                  offsetFromSymbolStart = "568">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -19218,6 +19263,21 @@
                   endingLineNumber = "287"
                   offsetFromSymbolStart = "1176">
                </Location>
+               <Location
+                  uuid = "AD20D381-9DAC-4A3C-BB39-D32DBB1FE0A6 - 4ffc432a058ef3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "static PDF_Reader_Pro.KMTools.parseIndexs(indexs: Swift.Array&lt;Swift.Int&gt;) -&gt; Swift.String"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Common/Tools/KMTools.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "286"
+                  endingLineNumber = "286"
+                  offsetFromSymbolStart = "1228">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -20248,6 +20308,36 @@
                   endingLineNumber = "489"
                   offsetFromSymbolStart = "1232">
                </Location>
+               <Location
+                  uuid = "7FB91844-AFA7-4955-B7FF-B54975D74E23 - 5de2cda0c74246d3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBatchOperateConvertViewController.updateFormatView() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "489"
+                  endingLineNumber = "489"
+                  offsetFromSymbolStart = "924">
+               </Location>
+               <Location
+                  uuid = "7FB91844-AFA7-4955-B7FF-B54975D74E23 - 5de2cda0c74246d3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBatchOperateConvertViewController.updateFormatView() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "489"
+                  endingLineNumber = "489"
+                  offsetFromSymbolStart = "1456">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -31542,6 +31632,21 @@
                   endingLineNumber = "643"
                   offsetFromSymbolStart = "1236">
                </Location>
+               <Location
+                  uuid = "3C0E030B-51BD-41A4-8C06-E8B274CAB778 - 41726cd29ed675b1"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView addImageAnnotation:center:isRemoveBGColor:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListView.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "643"
+                  endingLineNumber = "643"
+                  offsetFromSymbolStart = "1044">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>