|
|
@@ -517,6 +517,7 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
self.noteOutlineView.dataSource = self
|
|
|
self.noteOutlineView.botaDelegate = self
|
|
|
self.noteOutlineView.botaDataSource = self
|
|
|
+ self.noteOutlineView.noteDelegate = self
|
|
|
self.noteOutlineView.menu = NSMenu()
|
|
|
self.noteOutlineView.menu?.delegate = self
|
|
|
// [noteOutlineView setTypeSelectHelper:[SKTypeSelectHelper typeSelectHelperWithMatchOption:SKSubstringMatch]];
|
|
|
@@ -2026,77 +2027,6 @@ extension KMLeftSideViewController: KMThumbnailTableViewDelegate {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-//MARK: NSTableViewDelegate,NSTableViewDataSource
|
|
|
-
|
|
|
-//extension KMLeftSideViewController: NSTableViewDelegate,NSTableViewDataSource {
|
|
|
-// func numberOfRows(in tableView: NSTableView) -> Int {
|
|
|
-// return self.dataSource.count
|
|
|
-// }
|
|
|
-//
|
|
|
-// func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
|
|
|
-// let cell : KMLiftSideCellView = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMLiftSideCellView"), owner: self) as! KMLiftSideCellView
|
|
|
-// if row <= selectImage.count-1 {
|
|
|
-// if self.dataSource[row] == self.type {
|
|
|
-// cell.isSelect = true
|
|
|
-// cell.mothedImage.image = NSImage(named: selectImage[row])
|
|
|
-// cell.backgroundColor(NSColor.km_init(hex: "#DFE1E5"))
|
|
|
-// } else {
|
|
|
-// cell.isSelect = false
|
|
|
-// cell.mothedImage.image = NSImage(named: norImage[row])
|
|
|
-// cell.backgroundColor(NSColor.clear)
|
|
|
-// }
|
|
|
-// }
|
|
|
-// cell.index = row
|
|
|
-// cell.buttonClick = { [unowned self] index in
|
|
|
-// if ((index < self.dataSource.count) && (index > -1)) {
|
|
|
-//
|
|
|
-// let isSearch = self.type.methodType == .Search
|
|
|
-//
|
|
|
-// var show = true
|
|
|
-// if( self.type == self.dataSource[index]) {
|
|
|
-// self.type = KMLeftMethodMode()
|
|
|
-// show = false
|
|
|
-// } else {
|
|
|
-// self.type = self.dataSource[index]
|
|
|
-// show = true
|
|
|
-// }
|
|
|
-//
|
|
|
-// self.trackEvent(type: self.type.methodType)
|
|
|
-//
|
|
|
-// self.updateViewButtonState()
|
|
|
-// self.delegate?.controlStateChange?(self,show:show)
|
|
|
-//// self.leftTableview.selectRowIndexes([index], byExtendingSelection: true)
|
|
|
-//// self.leftTableview.reloadData()
|
|
|
-//
|
|
|
-// UserDefaults.standard.set(index, forKey: "KMBOTASelectedIndexKey")
|
|
|
-// UserDefaults.standard.synchronize()
|
|
|
-//
|
|
|
-// if (isSearch && show == false) {
|
|
|
-// self.view.window?.makeFirstResponder(self)
|
|
|
-// } else if (isSearch && self.type.methodType != .Search) { // 切换
|
|
|
-// self.view.window?.makeFirstResponder(self)
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// return cell
|
|
|
-// }
|
|
|
-//
|
|
|
-// func tableView(_ tableView: NSTableView, heightOfRow row: Int) -> CGFloat {
|
|
|
-// return 48
|
|
|
-// }
|
|
|
-//
|
|
|
-// func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
|
|
|
-// let rowView = KMCustomTableRowView()
|
|
|
-// rowView.selectionColor = NSColor(calibratedRed: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1.0)
|
|
|
-// rowView.color = NSColor.km_init(hex: "#F7F8FA")
|
|
|
-// return rowView
|
|
|
-// }
|
|
|
-//
|
|
|
-// func tableViewSelectionDidChange(_ notification: Notification) {
|
|
|
-//
|
|
|
-// }
|
|
|
-//}
|
|
|
-
|
|
|
//extension KMLeftSideViewController: KMPDFViewPanelSetViewControllerDelegate {
|
|
|
// func controller(_ controller: KMPDFViewPanelSetViewController, dispayDidChange dispay: KMPDFDisplayType) {
|
|
|
// self.delegate?.controller?(self, dispayDidChange: dispay)
|
|
|
@@ -2413,10 +2343,10 @@ extension KMLeftSideViewController: NSTableViewDelegate, NSTableViewDataSource {
|
|
|
let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMFindTableviewCell"), owner: self) as! KMFindTableviewCell
|
|
|
let selection = searchResults[row]
|
|
|
if let data = tableColumn?.identifier.rawValue, data == "results" {
|
|
|
- cell.resultLabel.attributedStringValue = selection.selection.attributedString()
|
|
|
+ cell.resultLabel.attributedStringValue = selection.attributedString
|
|
|
cell.resultLabel.textColor = KMAppearance.Layout.h0Color()
|
|
|
} else if let data = tableColumn?.identifier.rawValue, data == "page" {
|
|
|
- cell.resultLabel.stringValue = selection.selection.pages().first?.label ?? ""
|
|
|
+ cell.resultLabel.stringValue = "\(Int(selection.selection.page?.pageIndex() ?? 0))"
|
|
|
cell.resultLabel.textColor = KMAppearance.Layout.h2Color()
|
|
|
}
|
|
|
return cell
|
|
|
@@ -4193,19 +4123,6 @@ extension KMLeftSideViewController: NSOutlineViewDelegate, NSOutlineViewDataSour
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- - (void)outlineView:(NSOutlineView *)ov didChangeHiddenOfTableColumn:(NSTableColumn *)tableColumn {
|
|
|
- if (mwcFlags.autoResizeNoteRows &&
|
|
|
- [ov isEqual:rightSideController.noteOutlineView] &&
|
|
|
- [[tableColumn identifier] isEqualToString:NOTE_COLUMNID]) {
|
|
|
- [rowHeights removeAllFloats];
|
|
|
- [rightSideController.noteOutlineView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [rightSideController.noteOutlineView numberOfRows])]];
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- - (CGFloat)outlineView:(NSOutlineView *)ov heightOfRowByItem:(id)item {
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- (void)updateSelectRowHeight{
|
|
|
CGFloat rowHeight = 0;
|
|
|
PDFOutline *outline = [leftSideController.tocOutlineView itemAtRow:leftSideController.tocOutlineView.selectedRow];
|
|
|
@@ -4291,17 +4208,6 @@ extension KMLeftSideViewController: NSOutlineViewDelegate, NSOutlineViewDataSour
|
|
|
[leftSideController.tocOutlineView reloadData];
|
|
|
}
|
|
|
|
|
|
- - (BOOL)outlineView:(NSOutlineView *)ov canResizeRowByItem:(id)item {
|
|
|
- if ([ov isEqual:rightSideController.noteOutlineView]) {
|
|
|
- return YES;
|
|
|
- }
|
|
|
- return NO;
|
|
|
- }
|
|
|
-
|
|
|
- - (void)outlineView:(NSOutlineView *)ov setHeight:(CGFloat)newHeight ofRowByItem:(id)item {
|
|
|
- [rowHeights setFloat:newHeight forKey:item];
|
|
|
- }
|
|
|
-
|
|
|
- (NSArray *)noteItems:(NSArray *)items {
|
|
|
NSMutableArray *noteItems = [NSMutableArray array];
|
|
|
|
|
|
@@ -4315,14 +4221,6 @@ extension KMLeftSideViewController: NSOutlineViewDelegate, NSOutlineViewDataSour
|
|
|
return noteItems;
|
|
|
}
|
|
|
|
|
|
- - (void)outlineViewCommandKeyPressedDuringNavigation:(NSOutlineView *)ov {
|
|
|
- PDFAnnotation *annotation = [[self selectedNotes] lastObject];
|
|
|
- if (annotation) {
|
|
|
- [pdfView scrollAnnotationToVisible:annotation];
|
|
|
- [pdfView setActiveAnnotation:annotation];
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- (NSArray *)outlineView:(NSOutlineView *)ov typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)typeSelectHelper {
|
|
|
if ([ov isEqual:rightSideController.noteOutlineView]) {
|
|
|
NSInteger i, count = [rightSideController.noteOutlineView numberOfRows];
|
|
|
@@ -4478,6 +4376,38 @@ extension KMLeftSideViewController: KMTocOutlineViewDelegate {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+extension KMLeftSideViewController: KMNoteOutlineViewDelegate {
|
|
|
+ func outlineView(_ anOutlineView: NSOutlineView, canResizeRowByItem item: AnyObject?) -> Bool? {
|
|
|
+ if anOutlineView.isEqual(to: self.noteOutlineView) {
|
|
|
+ return true
|
|
|
+ }
|
|
|
+ return false
|
|
|
+ }
|
|
|
+
|
|
|
+ func outlineView(_ anOutlineView: NSOutlineView, setHeight newHeight: CGFloat, ofRowByItem item: AnyObject?) {
|
|
|
+// [rowHeights setFloat:newHeight forKey:item];
|
|
|
+ }
|
|
|
+
|
|
|
+ func outlineView(_ anOutlineView: NSOutlineView, didChangeHiddenOfTableColumn aTableColumn: NSTableColumn) {
|
|
|
+// if (mwcFlags.autoResizeNoteRows &&
|
|
|
+// [ov isEqual:rightSideController.noteOutlineView] &&
|
|
|
+// [[tableColumn identifier] isEqualToString:NOTE_COLUMNID]) {
|
|
|
+// [rowHeights removeAllFloats];
|
|
|
+// [rightSideController.noteOutlineView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [rightSideController.noteOutlineView numberOfRows])]];
|
|
|
+// }
|
|
|
+ }
|
|
|
+
|
|
|
+ func outlineViewCommandKeyPressedDuringNavigation(_ anOutlineView: NSOutlineView) {
|
|
|
+// PDFAnnotation *annotation = [[self selectedNotes] lastObject];
|
|
|
+// if (annotation) {
|
|
|
+// [pdfView scrollAnnotationToVisible:annotation];
|
|
|
+// [pdfView setActiveAnnotation:annotation];
|
|
|
+// }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
extension KMLeftSideViewController: NSSearchFieldDelegate {
|
|
|
|
|
|
}
|
