|
@@ -4255,13 +4255,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
|
|
self.currentWindowController = nil
|
|
self.currentWindowController = nil
|
|
|
|
|
|
self.toolbarController.cancelSelected(KMToolbarToolCompressItemIdentifier)
|
|
self.toolbarController.cancelSelected(KMToolbarToolCompressItemIdentifier)
|
|
-
|
|
|
|
-// let batchWindowController = KMBatchOperateWindowController.sharedWindowController
|
|
|
|
-// batchWindowController.window?.makeKeyAndOrderFront("")
|
|
|
|
-// let batchOperateFile = KMBatchOperateFile(filePath: files.first?.filePath ?? "")
|
|
|
|
-// batchWindowController.switchToOperateType(.RemovePassword, files: [batchOperateFile])
|
|
|
|
-// batchWindowController.window?.makeKeyAndOrderFront("")
|
|
|
|
-
|
|
|
|
|
|
+
|
|
let baseWindowController = KMBatchOperateBaseWindowController(windowNibName: "KMBatchOperateBaseWindowController")
|
|
let baseWindowController = KMBatchOperateBaseWindowController(windowNibName: "KMBatchOperateBaseWindowController")
|
|
if #available(macOS 10.13, *) {
|
|
if #available(macOS 10.13, *) {
|
|
baseWindowController.window?.makeKeyAndOrderFront(nil)
|
|
baseWindowController.window?.makeKeyAndOrderFront(nil)
|
|
@@ -4270,8 +4264,10 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
|
|
}
|
|
}
|
|
let arr = NSMutableArray()
|
|
let arr = NSMutableArray()
|
|
let file = KMBatchOperateFile(filePath: self.listView!.document!.documentURL!.path, type: .RemovePassword)
|
|
let file = KMBatchOperateFile(filePath: self.listView!.document!.documentURL!.path, type: .RemovePassword)
|
|
|
|
+ file.password = document?.password ?? ""
|
|
arr.add(file)
|
|
arr.add(file)
|
|
- baseWindowController.checkNeedPasswordSwitchToOperateType(operateType: .RemovePassword, files: arr as! [KMBatchOperateFile])
|
|
|
|
|
|
+// baseWindowController.checkNeedPasswordSwitchToOperateType(operateType: .RemovePassword, files: arr as! [KMBatchOperateFile])
|
|
|
|
+ baseWindowController.switchToOperateType(.RemovePassword, files: arr as! [KMBatchOperateFile])
|
|
}
|
|
}
|
|
|
|
|
|
controller.cancelAction = { [unowned self] controller in
|
|
controller.cancelAction = { [unowned self] controller in
|