PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMAnnotationTableCellView.swift

@@ -107,7 +107,7 @@ class KMAnnotationTableCellView: NSTableCellView {
                     (annotation.isKind(of: CPDFLineAnnotation.self)) ||
                     (annotation.isKind(of: CPDFCircleAnnotation.self)) {
             contentInfoImg.isHidden = false
-            contentInfoImg.image = NSImage(named:"KMImageNameNewTipSelected")
+            contentInfoImg.image = CPDFAnnotationModel(pdfAnnotations: [annotation]).annotationImage
         }
         
         if annotation.contents != nil && annotation.contents != "" {

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTypeImageView.m

@@ -58,9 +58,9 @@ NSString *SKNRedactString = @"SKNRedactString";
     if (@available(macOS 10.14, *)) {
         NSAppearanceName appearanceName = [[NSApp effectiveAppearance] bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
         if ([appearanceName isEqualToString:NSAppearanceNameDarkAqua]) {
-            strikePath = @"KMImageNameAnnotationStrikeoutDrak";
-            highlight = @"KMImageNameAnnotationHightlightDrak";
-            underline = @"KMImageNameAnnotationUnderlineDrak";
+            strikePath = @"KMImageNameAnnotationStrikeout";
+            highlight = @"KMImageNameAnnotationStrikeout";
+            underline = @"KMImageNameAnnotationStrikeout";
             inkImagePath = @"KMImageNameAnnotationFreehandDrak";
         }
     }

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/BookMarks/KMBookMarkViewController.swift

@@ -288,7 +288,7 @@ extension KMBookMarkViewController : NSTableViewDelegate,NSTableViewDataSource {
     }
     
     func tableViewSelectionDidChange(_ notification: Notification) {
-        if(self.bookTableView.selectedRow > 0 && self.bookTableView.selectedRow < self.dataSource.count) {
+        if(self.bookTableView.selectedRow >= 0 && self.bookTableView.selectedRow < self.dataSource.count) {
             let selectBookMark = self.dataSource[self.bookTableView.selectedRow]
             self.listView.go(toPageIndex: selectBookMark.pageIndex, animated: true)
             

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Outline/KMOutlineViewController.swift

@@ -208,8 +208,9 @@ class KMOutlineViewController: NSViewController,NSMenuItemValidation {
             __NSBeep()
         } else {
             let currentPDFOutline  = self.outlineView.item(atRow: selectedRowIndexes.last!) as! CPDFOutline
-            let parent = currentPDFOutline.parent
+            var parent = currentPDFOutline.parent
             let index = NSInteger(parent!.index) + 1
+            parent = parent?.parent
             if parent != nil {
                 self.addPDFOutlineToIndex(index: index, atParent: parent)
             } else {
@@ -320,10 +321,10 @@ class KMOutlineViewController: NSViewController,NSMenuItemValidation {
     }
     
     func renamePDFOutline(outline : CPDFOutline! , label:String) {
+        self.renameTextField.isEditable = false
         if outline.label == label {
             return
         }
-        
         outline.label = label
         self.outlineView.reloadData()
         
@@ -390,6 +391,9 @@ class KMOutlineViewController: NSViewController,NSMenuItemValidation {
         for i in 0..<numRows {
             let tPDFOutline = self.outlineView.item(atRow: i) as! CPDFOutline
             let tPage = tPDFOutline.destination.pageIndex
+            if tPage < 0 {
+                continue
+            }
             var page = self.listView.document.page(at: UInt(tPage))!
             var tDict : [String : CPDFPage] = ["\(i)":page]
             arr.append(tDict)