【BOTA】大纲列表原始数据兼容

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController+Action.swift

@@ -886,9 +886,10 @@ extension KMLeftSideViewController: NSMenuItemValidation {
 //            return YES;
 //        } else if (action == @selector(addForm:)) {
 //            return YES;
-//        } else if (action == @selector(toggleOutlineCaseInsensitiveSearch:)){
-//            [menuItem setState:self.outlineIgnoreCaseFlag?NSControlStateValueOn:NSControlStateValueOff];
-//            return YES;
+        else if action == #selector(toggleOutlineCaseInsensitiveSearch) {
+            menuItem.state = self.outlineIgnoreCaseFlag ? .on : .off
+            return true
+        }
 //        } else if (action == @selector(note_expandAllComments:) ||
 //                   action == @selector(note_foldAllComments:) ||
 //                   action == @selector(exportAnnotationNotes:) ||

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift

@@ -22,6 +22,10 @@ private let KMLeftSideViewAscendSortBoolKey = "KMLeftSideViewAscendSortBoolKey"
     @objc optional func controller(controller: KMLeftSideViewController, rotateType: KMRotateType)
 }
 
+extension KMLeftSideViewController.Key {
+    static let disableTableToolTipsKey = "SKDisableTableToolTips"
+}
+
 class KMLeftSideViewController: KMSideViewController {
     var dataSource : [KMLeftMethodMode] = [KMLeftMethodMode]()
 
@@ -197,7 +201,6 @@ class KMLeftSideViewController: KMSideViewController {
     var foldType: KMFoldAllAnnotationType = .none
     static let noteSortTypeKey = KMLeftSideViewNoteSortTypeKey
     static let ascendSorKey = KMLeftSideViewAscendSortBoolKey
-    private let SKDisableTableToolTipsKey = "SKDisableTableToolTips"
     
     var tocType: KMFoldType = .none
     
@@ -390,7 +393,7 @@ class KMLeftSideViewController: KMSideViewController {
 //        NSSortDescriptor *countDescriptor = [[[NSSortDescriptor alloc] initWithKey:SKGroupedSearchResultCountKey ascending:NO] autorelease];
 //        [groupedFindArrayController setSortDescriptors:[NSArray arrayWithObjects:countDescriptor, nil]];
         
-        if UserDefaults.standard.bool(forKey: SKDisableTableToolTipsKey) == false {
+        if KMDataManager.ud_bool(forKey: Self.Key.disableTableToolTipsKey) == false {
             self.tocOutlineView.hasImageToolTips = true
             self.findTableView.hasImageToolTips = true
             self.groupedFindTableView.hasImageToolTips = true
@@ -1377,9 +1380,6 @@ extension KMLeftSideViewController: NSTableViewDelegate, NSTableViewDataSource {
     func tableViewSelectionDidChange(_ notification: Notification) {
         if self.findTableView.isEqual(to: notification.object) {
             //            [self updateFindResultHighlightsForDirection:NSDirectSelection];
-            //
-            //            if ([self interactionMode] == SKPresentationMode && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
-            //                [self hideLeftSideWindow];
             let row = self.findTableView.selectedRow
             if row >= 0 {
                 let model = self.searchResults[row]
@@ -1391,9 +1391,6 @@ extension KMLeftSideViewController: NSTableViewDelegate, NSTableViewDataSource {
             }
         } else if self.groupedFindTableView.isEqual(to: notification.object) {
             //            [self updateFindResultHighlightsForDirection:NSDirectSelection];
-            //
-            //            if ([self interactionMode] == SKPresentationMode && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
-            //                [self hideLeftSideWindow];
         } else if self.thumbnailTableView.isEqual(to: notification.object) {
 //            if (mwcFlags.updatingThumbnailSelection == 0) {
             let row = self.thumbnailTableView.selectedRow
@@ -1403,10 +1400,6 @@ extension KMLeftSideViewController: NSTableViewDelegate, NSTableViewDataSource {
 //                [pdfView goToPage:[[pdfView document] pageAtIndex:row]];
                 self.listView.go(toPageIndex: row, animated: true)
             }
-                
-//                if ([self interactionMode] == SKPresentationMode && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
-//                    [self hideLeftSideWindow];
-                
 //                thumbnailSelectCount = row;
 //            var rowIndexSet = IndexSet()
 //            for i in 0 ..< self.thumbnailTableView.numberOfRows {
@@ -2984,8 +2977,6 @@ extension KMLeftSideViewController: NSOutlineViewDelegate, NSOutlineViewDataSour
                 self.updatingOutlineSelection = true
                 self.goToSelectedOutlineItem(nil)
                 self.updatingOutlineSelection = false
-                //            if ([self interactionMode] == SKPresentationMode && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
-                //                [self hideLeftSideWindow];
             }
         }
     }