|
@@ -90,6 +90,12 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
|
|
|
open weak var delegate: KMLeftSideViewControllerDelegate?
|
|
open weak var delegate: KMLeftSideViewControllerDelegate?
|
|
|
|
|
|
|
|
+ deinit {
|
|
|
|
+ KMPrint("KMLeftSideViewController deinit.")
|
|
|
|
+
|
|
|
|
+ NotificationCenter.default.removeObserver(self)
|
|
|
|
+ }
|
|
|
|
+
|
|
override var nibName: NSNib.Name? {
|
|
override var nibName: NSNib.Name? {
|
|
return "LeftSideView"
|
|
return "LeftSideView"
|
|
}
|
|
}
|
|
@@ -375,7 +381,6 @@ class KMLeftSideViewController: KMSideViewController {
|
|
NSArrayController *thumbnailArrayController;
|
|
NSArrayController *thumbnailArrayController;
|
|
|
|
|
|
NSArrayController *findArrayController;
|
|
NSArrayController *findArrayController;
|
|
- SKTableView *findTableView;
|
|
|
|
|
|
|
|
NSArrayController *groupedFindArrayController;
|
|
NSArrayController *groupedFindArrayController;
|
|
SKTableView *groupedFindTableView;
|
|
SKTableView *groupedFindTableView;
|
|
@@ -394,16 +399,17 @@ class KMLeftSideViewController: KMSideViewController {
|
|
// @property (nonatomic, retain) IBOutlet NSArrayController *thumbnailArrayController, *findArrayController, *groupedFindArrayController;
|
|
// @property (nonatomic, retain) IBOutlet NSArrayController *thumbnailArrayController, *findArrayController, *groupedFindArrayController;
|
|
// @property (nonatomic, retain) IBOutlet SKTocOutlineView *tocOutlineView;
|
|
// @property (nonatomic, retain) IBOutlet SKTocOutlineView *tocOutlineView;
|
|
// @property (nonatomic, retain) IBOutlet *;
|
|
// @property (nonatomic, retain) IBOutlet *;
|
|
-// @property (nonatomic, retain) IBOutlet SKTableView *findTableView;
|
|
|
|
|
|
+// @property (nonatomic, retain) IBOutlet *;
|
|
// @property (nonatomic, retain) IBOutlet SKTableView *groupedFindTableView;
|
|
// @property (nonatomic, retain) IBOutlet SKTableView *groupedFindTableView;
|
|
|
|
|
|
@IBOutlet var segmentedControl: KMSegmentedControl!
|
|
@IBOutlet var segmentedControl: KMSegmentedControl!
|
|
|
|
|
|
|
|
+ @IBOutlet var findTableView: KMBotaTableView!
|
|
@IBOutlet var thumbnailTableView: KMThumbnailTableView!
|
|
@IBOutlet var thumbnailTableView: KMThumbnailTableView!
|
|
|
|
|
|
@IBOutlet weak var leftListView: NSView!
|
|
@IBOutlet weak var leftListView: NSView!
|
|
|
|
|
|
-// @property (nonatomic, retain) IBOutlet KMSearchViewController *searchViewController;
|
|
|
|
|
|
+// @IBOutlet var searchViewController: KMSearchViewController!
|
|
@IBOutlet weak var toolButtonBox: NSBox!
|
|
@IBOutlet weak var toolButtonBox: NSBox!
|
|
@IBOutlet weak var toolButtonBoxLayoutConstraint: NSLayoutConstraint!
|
|
@IBOutlet weak var toolButtonBoxLayoutConstraint: NSLayoutConstraint!
|
|
@IBOutlet weak var snapshotNormalView: NSView!
|
|
@IBOutlet weak var snapshotNormalView: NSView!
|
|
@@ -466,7 +472,7 @@ class KMLeftSideViewController: KMSideViewController {
|
|
self.snapshotNormalView.layer?.backgroundColor = KMAppearance.Layout.l0Color().cgColor
|
|
self.snapshotNormalView.layer?.backgroundColor = KMAppearance.Layout.l0Color().cgColor
|
|
|
|
|
|
// tocOutlineView.backgroundColor = [KMAppearance KMColor_Layout_L0];
|
|
// tocOutlineView.backgroundColor = [KMAppearance KMColor_Layout_L0];
|
|
-// findTableView.backgroundColor = [KMAppearance KMColor_Layout_L0];
|
|
|
|
|
|
+ self.findTableView.backgroundColor = KMAppearance.KMColor_Layout_L0()
|
|
// groupedFindTableView.backgroundColor = [KMAppearance KMColor_Layout_L0];
|
|
// groupedFindTableView.backgroundColor = [KMAppearance KMColor_Layout_L0];
|
|
self.thumbnailTableView.backgroundColor = KMAppearance.Layout.l0Color()
|
|
self.thumbnailTableView.backgroundColor = KMAppearance.Layout.l0Color()
|
|
|
|
|
|
@@ -687,7 +693,8 @@ class KMLeftSideViewController: KMSideViewController {
|
|
// }
|
|
// }
|
|
// };
|
|
// };
|
|
|
|
|
|
-// [searchViewController loadView];
|
|
|
|
|
|
+ self.searchViewController.loadView()
|
|
|
|
+// self.searchViewController.
|
|
// searchViewController.contentView = findTableView.enclosingScrollView;
|
|
// searchViewController.contentView = findTableView.enclosingScrollView;
|
|
// self.searchField = searchViewController.searchField;
|
|
// self.searchField = searchViewController.searchField;
|
|
|
|
|
|
@@ -756,11 +763,9 @@ class KMLeftSideViewController: KMSideViewController {
|
|
// [tocOutlineView setDelegate:mainController];
|
|
// [tocOutlineView setDelegate:mainController];
|
|
// [tocOutlineView setDataSource:mainController];
|
|
// [tocOutlineView setDataSource:mainController];
|
|
self.thumbnailTableView.delegate = self
|
|
self.thumbnailTableView.delegate = self
|
|
-// [thumbnailTableView setDelegate:mainController];
|
|
|
|
-// [thumbnailTableView setDataSource:mainController];
|
|
|
|
self.thumbnailTableView.dataSource = self
|
|
self.thumbnailTableView.dataSource = self
|
|
self.thumbnailTableView.allowsMultipleSelection = true
|
|
self.thumbnailTableView.allowsMultipleSelection = true
|
|
-// [findTableView setDelegate:mainController];
|
|
|
|
|
|
+ self.findTableView.delegate = self
|
|
// // [groupedFindTableView setDelegate:mainController];
|
|
// // [groupedFindTableView setDelegate:mainController];
|
|
// [groupedFindTableView setDataSource:mainController];
|
|
// [groupedFindTableView setDataSource:mainController];
|
|
// [[thumbnailTableView menu] setDelegate:mainController];
|
|
// [[thumbnailTableView menu] setDelegate:mainController];
|
|
@@ -831,32 +836,6 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
|
|
|
@synthesize segmentedControl, searchViewController;
|
|
@synthesize segmentedControl, searchViewController;
|
|
|
|
|
|
- - (void)dealloc {
|
|
|
|
- [[NSNotificationCenter defaultCenter]removeObserver:self];
|
|
|
|
- [thumbnailTableView setDelegate:nil];
|
|
|
|
- [thumbnailTableView setDataSource:nil];
|
|
|
|
- [findTableView setDelegate:nil];
|
|
|
|
- // [groupedFindTableView setDelegate:nil];
|
|
|
|
- [groupedFindTableView setDataSource:nil];
|
|
|
|
- [tocOutlineView setDelegate:nil];
|
|
|
|
- [tocOutlineView setDataSource:nil];
|
|
|
|
- [_filterButtonLayer release];
|
|
|
|
- [_moreButtonLayer release];
|
|
|
|
- SKDESTROY(thumbnailArrayController);
|
|
|
|
- SKDESTROY(findArrayController);
|
|
|
|
- SKDESTROY(groupedFindArrayController);
|
|
|
|
- SKDESTROY(tocOutlineView);
|
|
|
|
- SKDESTROY(thumbnailTableView);
|
|
|
|
- SKDESTROY(findTableView);
|
|
|
|
- SKDESTROY(groupedFindTableView);
|
|
|
|
-
|
|
|
|
- SKDESTROY(segmentedControl);
|
|
|
|
- SKDESTROY(searchViewController);
|
|
|
|
- [super dealloc];
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- (BOOL)requiresAlternateButtonForView:(NSView *)aView {
|
|
- (BOOL)requiresAlternateButtonForView:(NSView *)aView {
|
|
return NO;
|
|
return NO;
|
|
return [findTableView isDescendantOf:aView] || [groupedFindTableView isDescendantOf:aView];
|
|
return [findTableView isDescendantOf:aView] || [groupedFindTableView isDescendantOf:aView];
|
|
@@ -1350,7 +1329,7 @@ extension KMLeftSideViewController {
|
|
self.thumbnailTableView.backgroundColor = NSColor(red: 0.149, green: 0.157, blue: 0.169, alpha: 1)
|
|
self.thumbnailTableView.backgroundColor = NSColor(red: 0.149, green: 0.157, blue: 0.169, alpha: 1)
|
|
// groupedFindTableView.backgroundColor = NSColor(red: 0.149, green: 0.157, blue: 0.169, alpha: 1)
|
|
// groupedFindTableView.backgroundColor = NSColor(red: 0.149, green: 0.157, blue: 0.169, alpha: 1)
|
|
// tocOutlineView.backgroundColor = NSColor(red: 0.149, green: 0.157, blue: 0.169, alpha: 1)
|
|
// tocOutlineView.backgroundColor = NSColor(red: 0.149, green: 0.157, blue: 0.169, alpha: 1)
|
|
-// findTableView.backgroundColor = NSColor(red: 0.149, green: 0.157, blue: 0.169, alpha: 1)
|
|
|
|
|
|
+ self.findTableView.backgroundColor = NSColor(red: 0.149, green: 0.157, blue: 0.169, alpha: 1)
|
|
|
|
|
|
self.snapshotSearchField.layer?.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1).cgColor
|
|
self.snapshotSearchField.layer?.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1).cgColor
|
|
self.outlineSearchField.layer?.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1).cgColor
|
|
self.outlineSearchField.layer?.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1).cgColor
|
|
@@ -1371,7 +1350,7 @@ extension KMLeftSideViewController {
|
|
self.thumbnailTableView.backgroundColor = NSColor(red: 0.988, green: 0.992, blue: 1.000, alpha: 1)
|
|
self.thumbnailTableView.backgroundColor = NSColor(red: 0.988, green: 0.992, blue: 1.000, alpha: 1)
|
|
// groupedFindTableView.backgroundColor = NSColor(red: 0.988, green: 0.992, blue: 1.000, alpha: 1)
|
|
// groupedFindTableView.backgroundColor = NSColor(red: 0.988, green: 0.992, blue: 1.000, alpha: 1)
|
|
// tocOutlineView.backgroundColor = NSColor(red: 0.988, green: 0.992, blue: 1.000, alpha: 1)
|
|
// tocOutlineView.backgroundColor = NSColor(red: 0.988, green: 0.992, blue: 1.000, alpha: 1)
|
|
-// findTableView.backgroundColor = NSColor(red: 0.988, green: 0.992, blue: 1.000, alpha: 1)
|
|
|
|
|
|
+ self.findTableView.backgroundColor = NSColor(red: 0.988, green: 0.992, blue: 1.000, alpha: 1)
|
|
|
|
|
|
self.snapshotSearchField.layer?.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1).cgColor
|
|
self.snapshotSearchField.layer?.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1).cgColor
|
|
self.outlineSearchField.layer?.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1).cgColor
|
|
self.outlineSearchField.layer?.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1).cgColor
|
|
@@ -1439,8 +1418,7 @@ extension KMLeftSideViewController: NSTableViewDelegate, NSTableViewDataSource {
|
|
cell.isSelectCell = false
|
|
cell.isSelectCell = false
|
|
}
|
|
}
|
|
return cell
|
|
return cell
|
|
- }
|
|
|
|
-// else if ([tableView isEqual:leftSideController.findTableView]) {
|
|
|
|
|
|
+ } else if (tableView.isEqual(to: self.findTableView)) {
|
|
// KMFindTableviewCell *cell = [tableView makeViewWithIdentifier:@"KMFindTableviewCell" owner:self];
|
|
// KMFindTableviewCell *cell = [tableView makeViewWithIdentifier:@"KMFindTableviewCell" owner:self];
|
|
// PDFSelection *selection = searchResults[row];
|
|
// PDFSelection *selection = searchResults[row];
|
|
// if ([tableColumn.identifier isEqualToString:@"results"]) {
|
|
// if ([tableColumn.identifier isEqualToString:@"results"]) {
|
|
@@ -1451,7 +1429,8 @@ extension KMLeftSideViewController: NSTableViewDelegate, NSTableViewDataSource {
|
|
// cell.resultLabel.textColor = [KMAppearance KMColor_Layout_H2];
|
|
// cell.resultLabel.textColor = [KMAppearance KMColor_Layout_H2];
|
|
// }
|
|
// }
|
|
// return cell;
|
|
// return cell;
|
|
-// } else if ([tableView isEqual:rightSideController.snapshotTableView]) {
|
|
|
|
|
|
+ }
|
|
|
|
+// else if ([tableView isEqual:rightSideController.snapshotTableView]) {
|
|
//
|
|
//
|
|
// KMSnapshotTableViewCell *cell = [tableView makeViewWithIdentifier:@"KMSnapshotTableViewCell" owner:self];
|
|
// KMSnapshotTableViewCell *cell = [tableView makeViewWithIdentifier:@"KMSnapshotTableViewCell" owner:self];
|
|
// SKSnapshotWindowController *snapshot = snapshots[row];
|
|
// SKSnapshotWindowController *snapshot = snapshots[row];
|
|
@@ -1550,19 +1529,21 @@ extension KMLeftSideViewController: NSTableViewDelegate, NSTableViewDataSource {
|
|
// thumbSize = NSMakeSize(snapshotSize.width, cellHeight);
|
|
// thumbSize = NSMakeSize(snapshotSize.width, cellHeight);
|
|
// }
|
|
// }
|
|
// return thumbSize.height;
|
|
// return thumbSize.height;
|
|
-// } else if ([tv isEqual:leftSideController.findTableView]) {
|
|
|
|
-// return 40.0;
|
|
|
|
// }
|
|
// }
|
|
|
|
+ else if (tableView.isEqual(to: self.findTableView)) {
|
|
|
|
+ return 40.0
|
|
|
|
+ }
|
|
return tableView.rowHeight
|
|
return tableView.rowHeight
|
|
}
|
|
}
|
|
|
|
|
|
-// func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
|
|
|
|
|
|
+ func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
|
|
|
|
+ if (tableView.isEqual(to: self.findTableView)) {
|
|
// if ([tableView isEqual:leftSideController.findTableView] || [tableView isEqual:leftSideController.groupedFindTableView]) {
|
|
// if ([tableView isEqual:leftSideController.findTableView] || [tableView isEqual:leftSideController.groupedFindTableView]) {
|
|
-// KMCustomTableRowView *rowView = [[[KMCustomTableRowView alloc] init] autorelease];
|
|
|
|
-// return rowView;
|
|
|
|
-// }
|
|
|
|
-// return nil;
|
|
|
|
-// }
|
|
|
|
|
|
+ let rowView = KMCustomTableRowView()
|
|
|
|
+ return rowView
|
|
|
|
+ }
|
|
|
|
+ return nil
|
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
/*
|
|
|
|
|