|
@@ -206,7 +206,7 @@ extension KMHomeViewController {
|
|
|
|
|
|
func createPDFButtonAction() {
|
|
|
let popViewDataArr = [NSLocalizedString("New Blank Page", comment: ""),
|
|
|
- NSLocalizedString("New From Web Page", comment: ""),
|
|
|
+// NSLocalizedString("New From Web Page", comment: ""),
|
|
|
NSLocalizedString("Import From Scanner", comment: "")]
|
|
|
createPopoverAction(popViewDataArr)
|
|
|
}
|
|
@@ -967,8 +967,7 @@ extension KMHomeViewController {
|
|
|
} else if count == NSLocalizedString("New From Web Page", comment: "") {
|
|
|
importFromWebPage("")
|
|
|
} else if count == NSLocalizedString("Import From Scanner", comment: "") {
|
|
|
- print("从扫描仪导入")
|
|
|
-
|
|
|
+ importFromScanner("")
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1005,7 +1004,16 @@ extension KMHomeViewController {
|
|
|
}
|
|
|
|
|
|
@IBAction func importFromScanner(_ sender: Any) {
|
|
|
-
|
|
|
+ let vc = KMDeviceBrowserWindowController.init(windowNibName: "KMDeviceBrowserWindowController")
|
|
|
+ vc.type = .scanner
|
|
|
+ vc.importCameraFileCallback = {(url: NSURL) -> () in
|
|
|
+ NSDocumentController.shared.openDocument(withContentsOf: url as URL, display: false) { document, documentWasAlreadyOpen, error in
|
|
|
+ if document is KMMainDocument {
|
|
|
+ (document as! KMMainDocument).isNewCreated = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ vc.showWindow(NSApp.mainWindow)
|
|
|
}
|
|
|
|
|
|
@IBAction func menuItemClick_mergePDF(_ sender: Any) {
|