|
@@ -211,7 +211,7 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
|
|
|
private var deletePages_ = Set<CPDFPage>()
|
|
|
|
|
|
- var snapshotController: KMSnapshotViewController?
|
|
|
+ var snapshotController = KMSnapshotViewController()
|
|
|
|
|
|
|
|
|
deinit {
|
|
@@ -269,6 +269,10 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
self.initSubView()
|
|
|
self.initDefalutValue()
|
|
|
|
|
|
+ self.snapshotController = KMSnapshotViewController(nibName: "KMSnapshotViewController", bundle: Bundle.main)
|
|
|
+ self.snapshotController.view.isHidden = true
|
|
|
+// self.view.addSubview(self.snapshotController.view)
|
|
|
+
|
|
|
self.searchViewController.loadView()
|
|
|
self.searchViewController.contentView = self.findTableView.enclosingScrollView
|
|
|
self.searchField = self.searchViewController.searchField
|
|
@@ -289,6 +293,7 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
self.displayGroupedFindViewAnimating(false)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
self.leftView.segmentedControl.block = { [unowned self] segIndex in
|
|
|
self.toolButtonBox.isHidden = false
|
|
|
self.toolButtonBoxLayoutConstraint.constant = 40.0
|
|
@@ -336,11 +341,17 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
return
|
|
|
}
|
|
|
FMTrackEventManager.defaultManager.trackEvent(event: "LeftSidebar", withProperties: ["LeftSidebar_Btn": "Btn_LeftSidebar_Snapshot"])
|
|
|
+
|
|
|
+ if self.snapshotController == nil {
|
|
|
+ self.snapshotController = KMSnapshotViewController.init()
|
|
|
+ }
|
|
|
+
|
|
|
self.refreshMethodType(methodType: .snapshot)
|
|
|
- self.toolButtonBox.contentView = self.snapshotController?.snapshotNormalView
|
|
|
+// self.toolButtonBox.contentView = self.snapshotController.snapshotNormalView
|
|
|
self.updateSnapshotFilterPredicate()
|
|
|
self.displaySnapshotViewAnimating(false)
|
|
|
self.updataLeftSideSnapView()
|
|
|
+
|
|
|
} else if (segIndex == 4) {
|
|
|
if self.type.methodType == .Search {
|
|
|
self.leftView.segmentedControl.selectedSegment = UInt8.max
|
|
@@ -389,7 +400,7 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
self.thumb_initSubViews()
|
|
|
self.outline_initSubViews()
|
|
|
self.note_initSubViews()
|
|
|
- self.snapshot_initSubViews()
|
|
|
+// self.snapshot_initSubViews()
|
|
|
self.search_initSubViews()
|
|
|
}
|
|
|
|
|
@@ -465,7 +476,7 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
frame.origin.y = 0
|
|
|
frame.size.height = self.snapshotTableView.enclosingScrollView?.superview?.frame.size.height ?? 0
|
|
|
self.snapshotTableView.enclosingScrollView?.frame = frame
|
|
|
- self.snapshotController?.emptySnapView.isHidden = true
|
|
|
+ self.snapshotController.emptySnapView.isHidden = true
|
|
|
|
|
|
self.updataLeftSideSnapView()
|
|
|
}
|
|
@@ -659,15 +670,15 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
}
|
|
|
|
|
|
func displaySnapshotFind() {
|
|
|
- self.searchField = self.snapshotController?.snapshotSearchField;
|
|
|
-
|
|
|
- let menu = NSMenu()
|
|
|
- _ = menu.addItem(title: KMLocalizedString("Ignore Case", "Menu item title"), action: #selector(toggleCaseInsensitiveNoteSearch), target: self)
|
|
|
- (self.snapshotController?.snapshotSearchField.cell as? NSSearchFieldCell)?.searchMenuTemplate = menu
|
|
|
- (self.snapshotController?.snapshotSearchField.cell as? NSSearchFieldCell)?.placeholderString = KMLocalizedString("Search Snapshots", "placeholder")
|
|
|
- self.snapshotController?.snapshotSearchField.action = #selector(searchNotes)
|
|
|
- self.snapshotController?.snapshotSearchField.target = self
|
|
|
- self.snapshotController?.snapshotSearchField.delegate = self
|
|
|
+// self.searchField = self.snapshotController.snapshotSearchField;
|
|
|
+//
|
|
|
+// let menu = NSMenu()
|
|
|
+// _ = menu.addItem(title: KMLocalizedString("Ignore Case", "Menu item title"), action: #selector(toggleCaseInsensitiveNoteSearch), target: self)
|
|
|
+// (self.snapshotController.snapshotSearchField.cell as? NSSearchFieldCell)?.searchMenuTemplate = menu
|
|
|
+// (self.snapshotController.snapshotSearchField.cell as? NSSearchFieldCell)?.placeholderString = KMLocalizedString("Search Snapshots", "placeholder")
|
|
|
+// self.snapshotController.snapshotSearchField.action = #selector(searchNotes)
|
|
|
+// self.snapshotController.snapshotSearchField.target = self
|
|
|
+// self.snapshotController.snapshotSearchField.delegate = self
|
|
|
}
|
|
|
|
|
|
func resetThumbnails(ks: Bool = true) {
|
|
@@ -708,12 +719,12 @@ class KMLeftSideViewController: KMSideViewController {
|
|
|
self.noteFilterButton.isHidden = false
|
|
|
self.noteMoreButton.isHidden = false
|
|
|
} else if (tag == 312) {
|
|
|
- self.snapshotController?.snapshotSearchField.isHidden = true
|
|
|
- self.snapshotController?.snapshotNormalSearchButton.isHidden = false
|
|
|
- self.snapshotController?.snapshotDoneButton.isHidden = true
|
|
|
- self.snapshotController?.snapshotLabel.isHidden = false
|
|
|
- self.snapshotController?.snapshotNormalZoomOutButton.isHidden = false
|
|
|
- self.snapshotController?.snapshotNormalZoomInButton.isHidden = false
|
|
|
+ self.snapshotController.snapshotSearchField.isHidden = true
|
|
|
+ self.snapshotController.snapshotNormalSearchButton.isHidden = false
|
|
|
+ self.snapshotController.snapshotDoneButton.isHidden = true
|
|
|
+ self.snapshotController.snapshotLabel.isHidden = false
|
|
|
+ self.snapshotController.snapshotNormalZoomOutButton.isHidden = false
|
|
|
+ self.snapshotController.snapshotNormalZoomInButton.isHidden = false
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -960,12 +971,12 @@ extension KMLeftSideViewController {
|
|
|
self.tocOutlineView.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.snapshotController?.snapshotSearchField.layer?.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1).cgColor
|
|
|
+ self.snapshotController.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.noteSearchField.layer?.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1).cgColor
|
|
|
self.segmentedControl.layer?.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1).cgColor
|
|
|
|
|
|
- self.snapshotController?.snapshotSearchField.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1)
|
|
|
+ self.snapshotController.snapshotSearchField.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1)
|
|
|
self.outlineSearchField.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1)
|
|
|
self.noteSearchField.backgroundColor = NSColor(red: 0.224, green: 0.235, blue: 0.243, alpha: 1)
|
|
|
} else {
|
|
@@ -980,12 +991,12 @@ extension KMLeftSideViewController {
|
|
|
self.tocOutlineView.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.snapshotController?.snapshotSearchField.layer?.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1).cgColor
|
|
|
+ self.snapshotController.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.noteSearchField.layer?.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1).cgColor
|
|
|
self.segmentedControl.layer?.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1).cgColor
|
|
|
|
|
|
- self.snapshotController?.snapshotSearchField.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1)
|
|
|
+ self.snapshotController.snapshotSearchField.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1)
|
|
|
self.outlineSearchField.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1)
|
|
|
self.noteSearchField.backgroundColor = NSColor(red: 0.922, green: 0.925, blue: 0.941, alpha: 1)
|
|
|
}
|
|
@@ -1143,14 +1154,14 @@ extension KMLeftSideViewController: NSTableViewDelegate, NSTableViewDataSource {
|
|
|
var newScaling = scaling + 0.1
|
|
|
let newSnapshotHeight = snapshotSize.width * newScaling.cgFloat
|
|
|
if (newSnapshotHeight > Self.kMinSidePaneWidth) {
|
|
|
- self.snapshotController?.snapshotNormalZoomInButton.isEnabled = false
|
|
|
+ self.snapshotController.snapshotNormalZoomInButton.isEnabled = false
|
|
|
} else {
|
|
|
- self.snapshotController?.snapshotNormalZoomInButton.isEnabled = true
|
|
|
+ self.snapshotController.snapshotNormalZoomInButton.isEnabled = true
|
|
|
}
|
|
|
if ((scaling - 0.1) < 0.3 || (newSnapshotHeight < 150.0)) {
|
|
|
- self.snapshotController?.snapshotNormalZoomOutButton.isEnabled = false
|
|
|
+ self.snapshotController.snapshotNormalZoomOutButton.isEnabled = false
|
|
|
} else {
|
|
|
- self.snapshotController?.snapshotNormalZoomOutButton.isEnabled = true
|
|
|
+ self.snapshotController.snapshotNormalZoomOutButton.isEnabled = true
|
|
|
}
|
|
|
|
|
|
let cellHeight = snapshotSize.height + 24.0
|