|
|
@@ -34,7 +34,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
|
|
|
static let kBundleDataFilename = "data"
|
|
|
|
|
|
- var pdfViewController: KMPDFViewController?
|
|
|
+ var mainViewController: KMMainViewController?
|
|
|
var homeViewController: KMNHomeViewController?
|
|
|
|
|
|
var bookmarkSheetController: KMBookmarkSheetController?
|
|
|
@@ -50,22 +50,22 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
var currentDocumentSetup: [String: Any] {
|
|
|
get {
|
|
|
var tempSetup: [String: Any] = [:]
|
|
|
-// let tempMainSetup: [String: Any] = mainViewController?.currentSetup() ?? [:]
|
|
|
-// let filePath = fileURL?.path ?? ""
|
|
|
-// if filePath.count > 0{
|
|
|
-// tempSetup.updateValue(filePath, forKey: KMDocumentSetupFileNameKey)
|
|
|
-// }else {
|
|
|
-// return tempSetup
|
|
|
-// }
|
|
|
-// if let alias = SKAlias.init(url: fileURL){
|
|
|
-// if let data = alias.data{
|
|
|
-// tempSetup.updateValue(data as Any, forKey: KMDocumentSetupAliasKey)
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// if tempSetup.count > 0 {
|
|
|
-// tempSetup.merge(tempMainSetup) { (_, new) in new }
|
|
|
-// }
|
|
|
+ let tempMainSetup: [String: Any] = mainViewController?.currentSetup() ?? [:]
|
|
|
+ let filePath = fileURL?.path ?? ""
|
|
|
+ if filePath.count > 0{
|
|
|
+ tempSetup.updateValue(filePath, forKey: KMDocumentSetupFileNameKey)
|
|
|
+ }else {
|
|
|
+ return tempSetup
|
|
|
+ }
|
|
|
+ if let alias = SKAlias.init(url: fileURL){
|
|
|
+ if let data = alias.data{
|
|
|
+ tempSetup.updateValue(data as Any, forKey: KMDocumentSetupAliasKey)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if tempSetup.count > 0 {
|
|
|
+ tempSetup.merge(tempMainSetup) { (_, new) in new }
|
|
|
+ }
|
|
|
return tempSetup
|
|
|
}
|
|
|
set {
|
|
|
@@ -116,12 +116,12 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
if let data = params.first as? KMResult, data == .cancel {
|
|
|
if let shouldClose = params.last as? Bool, shouldClose {
|
|
|
DispatchQueue.main.async {
|
|
|
-
|
|
|
+ self.mainViewController?.browserWindowController?.browser.windowDidBeginToClose()
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
DispatchQueue.main.async {
|
|
|
-
|
|
|
+ self.mainViewController?.browserWindowController?.browser.windowDidBeginToClose()
|
|
|
}
|
|
|
}
|
|
|
return
|
|
|
@@ -194,19 +194,19 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
browser.windowController.showWindow(self)
|
|
|
}
|
|
|
|
|
|
- pdfViewController = KMPDFViewController.init()
|
|
|
- pdfViewController?.myDocument = self
|
|
|
+ mainViewController = KMMainViewController.init()
|
|
|
+ mainViewController?.myDocument = self
|
|
|
self.mdFlags = MDFlags(exportOption: 0, exportUsingPanel: 0, gettingFileType: 0, convertingNotes: 0, needsPasswordToConvert: 0)
|
|
|
|
|
|
if ((self.fileURL?.path) != nil) {
|
|
|
let pdfDocument = CPDFDocument.init(url: URL(fileURLWithPath: self.fileURL!.path))
|
|
|
- pdfViewController?.document = pdfDocument
|
|
|
+ mainViewController?.document = pdfDocument
|
|
|
}
|
|
|
- if pdfViewController?.document == nil {
|
|
|
+ if mainViewController?.document == nil {
|
|
|
return
|
|
|
}
|
|
|
- self.view = pdfViewController?.view
|
|
|
-
|
|
|
+ self.view = mainViewController?.view
|
|
|
+
|
|
|
if let url = self.fileURL {
|
|
|
AppSandboxFileAccess().persistPermissionURL(url as URL)
|
|
|
let bookmarkData = try?url.bookmarkData(options: NSURL.BookmarkCreationOptions.withSecurityScope, includingResourceValuesForKeys: nil, relativeTo: nil)
|
|
|
@@ -223,7 +223,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
let isfirstTab = (activeIndex == 0)
|
|
|
if ishome && !isfirstTab { // 替换 【标签需要被替换】
|
|
|
self.addWindowController(currentWindowController!)
|
|
|
-// self.mainViewController?.browserWindowController = currentWindowController
|
|
|
+ self.mainViewController?.browserWindowController = currentWindowController
|
|
|
|
|
|
// 替换 document
|
|
|
currentWindowController?.browser.replaceTabContents(at: Int32(activeIndex), with: self)
|
|
|
@@ -247,10 +247,10 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
browser.windowController.showWindow(self)
|
|
|
browser.add(self, at: Int32()-1, inForeground: true)
|
|
|
self.addWindowController(browser.windowController)
|
|
|
-// self.mainViewController?.browserWindowController = browser.windowController as? KMBrowserWindowController
|
|
|
+ self.mainViewController?.browserWindowController = browser.windowController as? KMBrowserWindowController
|
|
|
}else { // 正常拼接到后面
|
|
|
self.addWindowController(currentWindowController!)
|
|
|
-// self.mainViewController?.browserWindowController = currentWindowController
|
|
|
+ self.mainViewController?.browserWindowController = currentWindowController
|
|
|
currentWindowController?.browser.add(self, at: Int32()-1, inForeground: true)
|
|
|
}
|
|
|
}
|
|
|
@@ -310,10 +310,10 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
self.save(nil)
|
|
|
} else if (self.isDocumentEdited) {
|
|
|
self.save(nil)
|
|
|
-// } else if (mainViewController != nil) {
|
|
|
-// if self.mainViewController!.isPDFDocumentEdited || self.mainViewController!.needSave {
|
|
|
-// self.save(nil)
|
|
|
-// }
|
|
|
+ } else if (mainViewController != nil) {
|
|
|
+ if self.mainViewController!.isPDFDocumentEdited || self.mainViewController!.needSave {
|
|
|
+ self.save(nil)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
super.canClose(withDelegate: delegate, shouldClose: shouldCloseSelector, contextInfo: contextInfo)
|
|
|
@@ -332,7 +332,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
}
|
|
|
|
|
|
override func saveTo(_ sender: Any?) {
|
|
|
- guard let pdfDoc = self.pdfViewController?.document else {
|
|
|
+ guard let pdfDoc = self.mainViewController?.listView.document else {
|
|
|
NSSound.beep()
|
|
|
return
|
|
|
}
|
|
|
@@ -453,7 +453,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
if mainWindow != nil {
|
|
|
let windowController = mainWindow!.windowController
|
|
|
if windowController?.window?.screen?.isEqual(NSScreen.screens[0]) ?? false{
|
|
|
-// return mainViewController?.interactionMode ?? .normal
|
|
|
+ return mainViewController?.interactionMode ?? .normal
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -476,12 +476,12 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
if let data = params.first as? KMResult, data == .cancel {
|
|
|
if let shouldClose = params.last as? Bool, shouldClose {
|
|
|
DispatchQueue.main.async {
|
|
|
-// self.mainViewController?.browserWindowController?.browser.windowDidBeginToClose()
|
|
|
+ self.mainViewController?.browserWindowController?.browser.windowDidBeginToClose()
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
DispatchQueue.main.async {
|
|
|
-// self.mainViewController?.browserWindowController?.browser.windowDidBeginToClose()
|
|
|
+ self.mainViewController?.browserWindowController?.browser.windowDidBeginToClose()
|
|
|
}
|
|
|
}
|
|
|
return
|
|
|
@@ -524,7 +524,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
// MARK: Autosaving
|
|
|
|
|
|
override func close() {
|
|
|
-// mainViewController?.cancelMeasureType()
|
|
|
+ mainViewController?.cancelMeasureType()
|
|
|
if self.isActive {
|
|
|
if browser != nil {
|
|
|
var activeIndex = 0
|
|
|
@@ -583,9 +583,9 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
}
|
|
|
|
|
|
func needSaveWatermark() -> Bool {
|
|
|
-// if let need = self.mainViewController?.saveWatermarkFlag {
|
|
|
-// return need
|
|
|
-// }
|
|
|
+ if let need = self.mainViewController?.saveWatermarkFlag {
|
|
|
+ return need
|
|
|
+ }
|
|
|
return false
|
|
|
}
|
|
|
|
|
|
@@ -597,7 +597,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
|
|
|
func pdfChangedNotification(_ notification: Notification) -> Void {
|
|
|
if !isHome {
|
|
|
- let mainViewController = pdfViewController
|
|
|
+ let mainViewController = mainViewController
|
|
|
var document: CPDFDocument!
|
|
|
|
|
|
let dic = notification.object as? NSDictionary
|
|
|
@@ -666,7 +666,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
}
|
|
|
|
|
|
func setDataFromTmpData() {
|
|
|
- guard let _document = self.pdfViewController?.document else {
|
|
|
+ guard let _document = self.mainViewController?.document else {
|
|
|
return
|
|
|
}
|
|
|
if (_document.permissionsStatus != .owner) {
|
|
|
@@ -678,7 +678,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
self.getPassword(&password, fileId: fileId)
|
|
|
if (password != nil) {
|
|
|
self.isUnlockFromKeychain = true
|
|
|
-// self.mainViewController?.model.password = password as String?
|
|
|
+ self.mainViewController?.model.password = password as String?
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -713,6 +713,8 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
if (password != nil) {
|
|
|
self.isUnlockFromKeychain = true
|
|
|
document.unlock(withPassword: password! as String)
|
|
|
+ self.mainViewController?.model.password = password as String?
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -796,10 +798,10 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
KMPrint("convertNotes")
|
|
|
}
|
|
|
@IBAction func batchRemovePassWord(_ sender: Any?) {
|
|
|
-
|
|
|
+ self.mainViewController?.clickChildTool(type: .secure, index: 2)
|
|
|
}
|
|
|
@IBAction func batchRemovPrivatySecurity(_ sender: Any?) {
|
|
|
-
|
|
|
+ self.mainViewController?.removeOwnerPassword()
|
|
|
}
|
|
|
@IBAction func printPDFDocument(_ sender: Any?) {
|
|
|
|
|
|
@@ -835,8 +837,12 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
|
|
|
switch type {
|
|
|
case .bookmark:
|
|
|
- let mainViewController = pdfViewController
|
|
|
-
|
|
|
+ let mainViewController = mainViewController
|
|
|
+ if let page = mainViewController?.listView.currentPage() {
|
|
|
+ let index: UInt = page.pageIndex()
|
|
|
+ bookmark = KMBookmark.bookmark(url: self.fileURL!, pageIndex: index, label: label)
|
|
|
+ }
|
|
|
+
|
|
|
case .setup: break
|
|
|
let setup = currentDocumentSetup
|
|
|
bookmark = KMBookmark.bookmark(setup: setup, label: label)
|
|
|
@@ -885,7 +891,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
if let data = self.pdfData {
|
|
|
fileWrapper.addRegularFile(withContents: data, preferredFilename: aName + ".pdf")
|
|
|
}
|
|
|
- if let data = self.pdfViewController?.document?.string()?.data(using: .utf8) {
|
|
|
+ if let data = self.mainViewController?.document?.string()?.data(using: .utf8) {
|
|
|
fileWrapper.addRegularFile(withContents: data, preferredFilename: Self.kBundleDataFilename + ".txt")
|
|
|
}
|
|
|
if let data = try?PropertyListSerialization.data(fromPropertyList: info, format: .xml, options: PropertyListSerialization.WriteOptions(0)) {
|
|
|
@@ -906,34 +912,35 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
}
|
|
|
var success = true
|
|
|
if !self.isHome {
|
|
|
- if pdfViewController != nil {
|
|
|
-// pdfViewController?.savePdfAlertView()
|
|
|
- if pdfViewController?.document != nil {
|
|
|
-// self.pdfViewController?.commitEditingIfNeed()
|
|
|
+ if mainViewController != nil {
|
|
|
+ mainViewController?.savePdfAlertView()
|
|
|
+ if mainViewController?.document != nil {
|
|
|
+ self.mainViewController?.commitEditingIfNeed()
|
|
|
+
|
|
|
|
|
|
-// if (mainViewController!.needSave) {
|
|
|
-// if let options = self.mainViewController?.secureOptions, !options.isEmpty {
|
|
|
-// self.mainViewController!.document?.setDocumentAttributes(self.mainViewController?.documentAttribute)
|
|
|
-// success = self.mainViewController!.document!.write(to: url, withOptions: options)
|
|
|
-// } else if let flag = self.mainViewController?.removeSecureFlag, flag {
|
|
|
-// success = self.mainViewController!.document!.writeDecrypt(to: url)
|
|
|
-// } else {
|
|
|
-// if(mainViewController?.hasEnterRedact() == true) {
|
|
|
-// success = mainViewController?.redactController.redactPdfView.document?.write(to: url) ?? false
|
|
|
-// } else {
|
|
|
-// success = mainViewController!.document!.write(to: url)
|
|
|
-// }
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// if(mainViewController?.hasEnterRedact() == true) {
|
|
|
-// success = mainViewController?.redactController.redactPdfView.document?.write(to: url) ?? false
|
|
|
-// } else {
|
|
|
-// success = mainViewController!.document!.write(to: url)
|
|
|
-// }
|
|
|
-// }
|
|
|
-// self.mainViewController?.needSave = false
|
|
|
-// self.mainViewController?.clearSecureOptions()
|
|
|
-// self.mainViewController?.clearRemoveSecureFlag()
|
|
|
+ if (mainViewController!.needSave) {
|
|
|
+ if let options = self.mainViewController?.secureOptions, !options.isEmpty {
|
|
|
+ self.mainViewController!.document?.setDocumentAttributes(self.mainViewController?.documentAttribute)
|
|
|
+ success = self.mainViewController!.document!.write(to: url, withOptions: options)
|
|
|
+ } else if let flag = self.mainViewController?.removeSecureFlag, flag {
|
|
|
+ success = self.mainViewController!.document!.writeDecrypt(to: url)
|
|
|
+ } else {
|
|
|
+ if(mainViewController?.hasEnterRedact() == true) {
|
|
|
+ success = mainViewController?.redactController.redactPdfView.document?.write(to: url) ?? false
|
|
|
+ } else {
|
|
|
+ success = mainViewController!.document!.write(to: url)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if(mainViewController?.hasEnterRedact() == true) {
|
|
|
+ success = mainViewController?.redactController.redactPdfView.document?.write(to: url) ?? false
|
|
|
+ } else {
|
|
|
+ success = mainViewController!.document!.write(to: url)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ self.mainViewController?.needSave = false
|
|
|
+ self.mainViewController?.clearSecureOptions()
|
|
|
+ self.mainViewController?.clearRemoveSecureFlag()
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -950,9 +957,9 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
if success && isNewCreated && NSDocument.SaveOperationType.saveAsOperation == saveOperation {
|
|
|
isNewCreated = false
|
|
|
}
|
|
|
-// if mainViewController != nil {
|
|
|
-// mainViewController?.savePdfFinishAlertView()
|
|
|
-// }
|
|
|
+ if mainViewController != nil {
|
|
|
+ mainViewController?.savePdfFinishAlertView()
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private func _km_saveForWatermark(openAccessoryView: Bool = true, subscribeDidClick: (()->Void)? = nil, callback:@escaping (_ needSave: Bool, _ param: Any...)->Void) {
|
|
|
@@ -974,7 +981,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
}
|
|
|
|
|
|
if (isWaterMarkExport) {
|
|
|
- guard let _document = self.pdfViewController?.document else {
|
|
|
+ guard let _document = self.mainViewController?.document else {
|
|
|
callback(false, KMResult.failure)
|
|
|
return
|
|
|
}
|
|
|
@@ -992,18 +999,18 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
callback(false, KMResult.cancel, true)
|
|
|
return
|
|
|
}
|
|
|
-// guard let _url = KMTools.saveWatermarkDocument(document: _document, to: url!, secureOptions: self.mainViewController?.secureOptions, documentAttribute: self.mainViewController?.documentAttribute,removePWD: self.mainViewController!.removeSecureFlag) else {
|
|
|
-// callback(false, KMResult.failure)
|
|
|
-// return
|
|
|
-// }
|
|
|
-// callback(false, KMResult.success)
|
|
|
-// if (isOpen) {
|
|
|
-// NSDocumentController.shared.km_safe_openDocument(withContentsOf: _url, display: true) { _, _, _ in
|
|
|
-//
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// NSWorkspace.shared.activateFileViewerSelecting([_url])
|
|
|
-// }
|
|
|
+ guard let _url = KMTools.saveWatermarkDocument(document: _document, to: url!, secureOptions: self.mainViewController?.secureOptions, documentAttribute: self.mainViewController?.documentAttribute,removePWD: self.mainViewController!.removeSecureFlag) else {
|
|
|
+ callback(false, KMResult.failure)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ callback(false, KMResult.success)
|
|
|
+ if (isOpen) {
|
|
|
+ NSDocumentController.shared.km_safe_openDocument(withContentsOf: _url, display: true) { _, _, _ in
|
|
|
+
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ NSWorkspace.shared.activateFileViewerSelecting([_url])
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return
|
|
|
@@ -1046,17 +1053,17 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
if self._canAttachNotesForType(typeName) {
|
|
|
matrix?.isHidden = false
|
|
|
let ws = NSWorkspace.shared
|
|
|
-// let isLocked = self.mainViewController?.listView.document.isLocked ?? false
|
|
|
-// let allowsPrinting = self.mainViewController?.listView.document.allowsPrinting ?? false
|
|
|
-// if ws.type(typeName, conformsToType: KMPDFDocumentType) && isLocked == false && allowsPrinting {
|
|
|
-// (matrix?.cell(withTag: KMExportOption.withEmbeddedNotes.rawValue))?.isEnabled = true
|
|
|
-// } else {
|
|
|
-// (matrix?.cell(withTag: KMExportOption.withEmbeddedNotes.rawValue))?.isEnabled = false
|
|
|
-// if let data = self.mdFlags?.exportOption, data == KMExportOption.withEmbeddedNotes.rawValue {
|
|
|
-// self.mdFlags?.exportOption = UInt32(KMExportOption.default.rawValue)
|
|
|
-// matrix?.selectCell(withTag: KMExportOption.default.rawValue)
|
|
|
-// }
|
|
|
-// }
|
|
|
+ let isLocked = self.mainViewController?.listView.document.isLocked ?? false
|
|
|
+ let allowsPrinting = self.mainViewController?.listView.document.allowsPrinting ?? false
|
|
|
+ if ws.type(typeName, conformsToType: KMPDFDocumentType) && isLocked == false && allowsPrinting {
|
|
|
+ (matrix?.cell(withTag: KMExportOption.withEmbeddedNotes.rawValue))?.isEnabled = true
|
|
|
+ } else {
|
|
|
+ (matrix?.cell(withTag: KMExportOption.withEmbeddedNotes.rawValue))?.isEnabled = false
|
|
|
+ if let data = self.mdFlags?.exportOption, data == KMExportOption.withEmbeddedNotes.rawValue {
|
|
|
+ self.mdFlags?.exportOption = UInt32(KMExportOption.default.rawValue)
|
|
|
+ matrix?.selectCell(withTag: KMExportOption.default.rawValue)
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
matrix?.isHidden = true
|
|
|
}
|
|
|
@@ -1119,7 +1126,7 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
|
|
|
if self.isHome {
|
|
|
return NSPrintOperation()
|
|
|
}
|
|
|
- let documentURL = self.pdfViewController?.document?.documentURL
|
|
|
+ let documentURL = self.mainViewController?.document?.documentURL
|
|
|
if documentURL == nil {
|
|
|
return NSPrintOperation()
|
|
|
}
|
|
|
@@ -1171,7 +1178,7 @@ extension KMMainDocument {
|
|
|
return self.isDocumentEdited
|
|
|
}
|
|
|
|
|
|
- guard let mainVC = self.pdfViewController else {
|
|
|
+ guard let mainVC = self.mainViewController else {
|
|
|
return false
|
|
|
}
|
|
|
// return mainVC.isPDFDocumentEdited || mainVC.needSave
|
|
|
@@ -1181,7 +1188,7 @@ extension KMMainDocument {
|
|
|
if self.isHome {
|
|
|
return false
|
|
|
}
|
|
|
- guard let doc = self.pdfViewController?.document else {
|
|
|
+ guard let doc = self.mainViewController?.document else {
|
|
|
return false
|
|
|
}
|
|
|
let allowsPrinting = doc.allowsPrinting
|
|
|
@@ -1418,18 +1425,18 @@ extension KMMainDocument: SKPDFSynchronizerDelegate {
|
|
|
}
|
|
|
|
|
|
func synchronizer(_ synchronizer: SKPDFSynchronizer!, foundLocation point: NSPoint, atPageIndex pageIndex: UInt, options: Int) {
|
|
|
-// guard let pdfDoc = self.mainViewController?.document else { return }
|
|
|
-// if pageIndex < pdfDoc.pageCount {
|
|
|
-// if let page = pdfDoc.page(at: pageIndex) {
|
|
|
-// var adjustedPoint = point
|
|
|
-// if options & SKPDFSynchronizerFlippedMask != 0 {
|
|
|
-// let mediaBox = page.bounds(for: .mediaBox)
|
|
|
-// adjustedPoint.y = NSMaxY(mediaBox) - adjustedPoint.y
|
|
|
-// }
|
|
|
-//
|
|
|
-// self.mainViewController?.listView.displayLine(at: adjustedPoint, inPageAtIndex: Int(pageIndex), showReadingBar: options & SKPDFSynchronizerShowReadingBarMask != 0)
|
|
|
-// }
|
|
|
-// }
|
|
|
+ guard let pdfDoc = self.mainViewController?.document else { return }
|
|
|
+ if pageIndex < pdfDoc.pageCount {
|
|
|
+ if let page = pdfDoc.page(at: pageIndex) {
|
|
|
+ var adjustedPoint = point
|
|
|
+ if options & SKPDFSynchronizerFlippedMask != 0 {
|
|
|
+ let mediaBox = page.bounds(for: .mediaBox)
|
|
|
+ adjustedPoint.y = NSMaxY(mediaBox) - adjustedPoint.y
|
|
|
+ }
|
|
|
+
|
|
|
+ self.mainViewController?.listView.displayLine(at: adjustedPoint, inPageAtIndex: Int(pageIndex), showReadingBar: options & SKPDFSynchronizerShowReadingBarMask != 0)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
