【综合】注释回复UI调整

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteNoExpand.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "tri.pdf",
+      "filename" : "ic.pdf",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "tri 1.pdf",
+      "filename" : "ic 1.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteNoExpand.imageset/tri 1.pdf

@@ -10,12 +10,12 @@ stream
 /DeviceRGB CS
 /DeviceRGB cs
 q
-0.000000 1.000000 -1.000000 0.000000 16.000000 6.000000 cm
-0.000000 0.000000 0.000000 scn
-0.000000 8.000000 m
-4.000000 4.000000 l
-8.000000 8.000000 l
+0.000000 -1.000000 -1.000000 -0.000000 14.000000 12.000001 cm
+0.305882 0.498039 0.858824 scn
+8.000000 7.989752 m
+3.995897 3.000000 l
 0.000000 8.000000 l
+8.000000 7.989752 l
 h
 f*
 n
@@ -25,13 +25,13 @@ endstream
 endobj
 
 3 0 obj
-  209
+  212
 endobj
 
 4 0 obj
   << /Annots []
      /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
      /Resources 1 0 R
      /Contents 2 0 R
      /Parent 5 0 R
@@ -56,15 +56,15 @@ xref
 0000000000 65535 f
 0000000010 00000 n
 0000000034 00000 n
-0000000299 00000 n
-0000000321 00000 n
-0000000494 00000 n
-0000000568 00000 n
+0000000302 00000 n
+0000000324 00000 n
+0000000497 00000 n
+0000000571 00000 n
 trailer
 << /ID [ (some) (id) ]
    /Root 6 0 R
    /Size 7
 >>
 startxref
-627
+630
 %%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Note/KMImageNameBotaNoteNoExpand.imageset/tri.pdf

@@ -10,12 +10,12 @@ stream
 /DeviceRGB CS
 /DeviceRGB cs
 q
-0.000000 1.000000 -1.000000 0.000000 16.000000 6.000000 cm
-0.000000 0.000000 0.000000 scn
-0.000000 8.000000 m
-4.000000 4.000000 l
-8.000000 8.000000 l
+0.000000 -1.000000 -1.000000 -0.000000 14.000000 12.000001 cm
+0.152276 0.234759 0.385445 scn
+8.000000 7.989752 m
+3.995897 3.000000 l
 0.000000 8.000000 l
+8.000000 7.989752 l
 h
 f*
 n
@@ -25,13 +25,13 @@ endstream
 endobj
 
 3 0 obj
-  209
+  212
 endobj
 
 4 0 obj
   << /Annots []
      /Type /Page
-     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
      /Resources 1 0 R
      /Contents 2 0 R
      /Parent 5 0 R
@@ -56,15 +56,15 @@ xref
 0000000000 65535 f
 0000000010 00000 n
 0000000034 00000 n
-0000000299 00000 n
-0000000321 00000 n
-0000000494 00000 n
-0000000568 00000 n
+0000000302 00000 n
+0000000324 00000 n
+0000000497 00000 n
+0000000571 00000 n
 trailer
 << /ID [ (some) (id) ]
    /Root 6 0 R
    /Size 7
 >>
 startxref
-627
+630
 %%EOF

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/Controller/KMNoteOutlineFilterViewController.swift

@@ -365,9 +365,10 @@ class KMNoteOutlineFilterViewController: NSViewController {
             self.selectAuthorArray = NSMutableArray()
         }
         
+        
         if let data = sud.object(forKey: Self.filterSelectStateKey + (self.listView?.document?.documentURL.path ?? "")) as? NSData {
             if let array = NSKeyedUnarchiver.unarchiveObject(with: data as Data) as? NSArray {
-                self.selectAuthorArray = NSMutableArray(array: array)
+                self.selectStateArray = NSMutableArray(array: array)
             }
         }
         
@@ -428,6 +429,7 @@ class KMNoteOutlineFilterViewController: NSViewController {
         self.scrollView.autohidesScrollers = true
 //        self.scrollView.alphaValue = 0
         self.stateCollectionView.allowsMultipleSelection = true
+        self.stateCollectionView.allowsEmptySelection = true
         
         self.authorCollectionView.register(KMNoteFilterCollevtionViewItem.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMNoteFilterCollevtionViewItem"))
         self.colorCollectionView.register(KMNoteColorCollectionViewItem.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMNoteColorCollectionViewItem"))
@@ -458,28 +460,28 @@ class KMNoteOutlineFilterViewController: NSViewController {
     }
     
     @IBAction func applyButtonAction(_ sender: NSButton) {
-        var hasMark = false
-        var hasReview = false
-        for data in (self.selectStateArray as? [NSNumber]) ?? []  {
-            let state = data.intValue
-            if state == CPDFAnnotationState.marked.rawValue || state == CPDFAnnotationState.unMarked.rawValue {
-                hasMark = true
-            }
-            if state == CPDFAnnotationState.none.rawValue || state == CPDFAnnotationState.accepted.rawValue || state == CPDFAnnotationState.rejected.rawValue || state == CPDFAnnotationState.canceled.rawValue || state == CPDFAnnotationState.completed.rawValue {
-                hasReview = true
-            }
-        }
-        if hasMark == false {
-            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.marked.rawValue))
-            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.unMarked.rawValue))
-        }
-        if hasReview == false {
-            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.none.rawValue))
-            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.accepted.rawValue))
-            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.rejected.rawValue))
-            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.canceled.rawValue))
-            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.completed.rawValue))
-        }
+//        var hasMark = false
+//        var hasReview = false
+//        for data in (self.selectStateArray as? [NSNumber]) ?? []  {
+//            let state = data.intValue
+//            if state == CPDFAnnotationState.marked.rawValue || state == CPDFAnnotationState.unMarked.rawValue {
+//                hasMark = true
+//            }
+//            if state == CPDFAnnotationState.none.rawValue || state == CPDFAnnotationState.accepted.rawValue || state == CPDFAnnotationState.rejected.rawValue || state == CPDFAnnotationState.canceled.rawValue || state == CPDFAnnotationState.completed.rawValue {
+//                hasReview = true
+//            }
+//        }
+//        if hasMark == false {
+//            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.marked.rawValue))
+//            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.unMarked.rawValue))
+//        }
+//        if hasReview == false {
+//            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.none.rawValue))
+//            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.accepted.rawValue))
+//            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.rejected.rawValue))
+//            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.canceled.rawValue))
+//            self.selectStateArray?.add(NSNumber(value: CPDFAnnotationState.completed.rawValue))
+//        }
         
         let data1 = NSKeyedArchiver.archivedData(withRootObject: NSArray(array: self.selectTypeArray!))
         let data2 = NSKeyedArchiver.archivedData(withRootObject: NSArray(array: self.selectColorArray!))
@@ -669,12 +671,13 @@ extension KMNoteOutlineFilterViewController: NSCollectionViewDelegate, NSCollect
                     return
                 }
                 let data = NSNumber(value: state.rawValue)
-                KMPrint("kkkkkkkkkkkkkkkkkkkkk")
                 if let con = self?.selectStateArray?.contains(data), con {
                     self?.selectStateArray?.remove(data)
                 } else {
                     self?.selectStateArray?.add(data)
                 }
+                
+                self?.stateCollectionView.reloadData()
             }
 //            let state = self.stateArray_[indexPath.item]
 //            item.view.wantsLayer = true

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteFilterStateCollevtionViewItem.swift

@@ -35,10 +35,13 @@ class KMNoteFilterStateCollevtionViewItem: NSCollectionViewItem {
                 self.box.fillColor = .clear
                 self.label.textColor = KMAppearance.Layout.h0Color()
             }
-            
-            KMPrint("ooooooooo"+"\(self.isSelected)")
-            self.selectCallback?(self.isSelected)
         }
     }
     
+    override func mouseUp(with event: NSEvent) {
+        super.mouseUp(with: event)
+        
+        self.selectCallback?(self.isSelected)
+    }
+    
 }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteFooterCellView.xib

@@ -40,13 +40,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="nRc-Dh-PEL" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                <rect key="frame" x="16" y="34" width="425" height="32"/>
+                                <rect key="frame" x="18" y="34" width="423" height="32"/>
                                 <view key="contentView" id="fIS-wd-lpj">
-                                    <rect key="frame" x="1" y="1" width="423" height="30"/>
+                                    <rect key="frame" x="1" y="1" width="421" height="30"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HuQ-4F-E6t" customClass="KMTextField" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                            <rect key="frame" x="4" y="7" width="415" height="16"/>
+                                            <rect key="frame" x="4" y="7" width="413" height="16"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="6De-hm-do0">
                                                 <font key="font" usesAppearanceFont="YES"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -65,14 +65,14 @@
                                 </constraints>
                             </box>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cqz-a4-FAh">
-                                <rect key="frame" x="321" y="6" width="45" height="16"/>
+                                <rect key="frame" x="325" y="6" width="45" height="16"/>
                                 <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="ZIH-CU-juN">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
                             <box boxType="custom" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="cRx-uY-ael">
-                                <rect key="frame" x="378" y="1" width="59" height="26"/>
+                                <rect key="frame" x="382" y="1" width="59" height="26"/>
                                 <view key="contentView" id="B99-lm-QE0">
                                     <rect key="frame" x="1" y="1" width="57" height="24"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -97,9 +97,9 @@
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="nRc-Dh-PEL" secondAttribute="trailing" constant="12" id="0Ur-tE-yDr"/>
                             <constraint firstItem="cqz-a4-FAh" firstAttribute="top" secondItem="nRc-Dh-PEL" secondAttribute="bottom" constant="12" id="CkL-Wf-SbD"/>
-                            <constraint firstAttribute="trailing" secondItem="cRx-uY-ael" secondAttribute="trailing" constant="16" id="E8c-fj-OFJ"/>
+                            <constraint firstAttribute="trailing" secondItem="cRx-uY-ael" secondAttribute="trailing" constant="12" id="E8c-fj-OFJ"/>
                             <constraint firstItem="nRc-Dh-PEL" firstAttribute="top" secondItem="fr9-7p-tnW" secondAttribute="top" constant="4" id="JUc-qE-48C"/>
-                            <constraint firstItem="nRc-Dh-PEL" firstAttribute="leading" secondItem="fr9-7p-tnW" secondAttribute="leading" constant="16" id="Sn4-P3-Sde"/>
+                            <constraint firstItem="nRc-Dh-PEL" firstAttribute="leading" secondItem="fr9-7p-tnW" secondAttribute="leading" constant="18" id="Sn4-P3-Sde"/>
                             <constraint firstItem="cRx-uY-ael" firstAttribute="top" secondItem="nRc-Dh-PEL" secondAttribute="bottom" constant="7" id="WE7-UJ-kBO"/>
                             <constraint firstItem="cRx-uY-ael" firstAttribute="leading" secondItem="cqz-a4-FAh" secondAttribute="trailing" constant="12" id="k4S-s6-v7D"/>
                         </constraints>

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

@@ -904,7 +904,8 @@ extension KMLeftSideViewController {
             let typeArr: [String] = KMBotaTools.noteFilterAnnoTypes(key: filterKey)
             let colorArr: [Any] = KMBotaTools.noteFilterColors(key: filterKey)
             let authorArr: [Any] = KMBotaTools.noteFilterAuthors(key: filterKey)
-            let stateArr: [NSNumber] = KMBotaTools.noteFilterStates(key: filterKey)
+            var stateArr: [NSNumber] = KMBotaTools.noteFilterStates(key: filterKey)
+            
             if typeArr.count == 0 && colorArr.count == 0 && authorArr.count == 0  && stateArr.count == 0 {
 //                self.filtrateButton.image = NSImage(named: "KMImageNameAnnotationsFiltrate")
                 self.filterButtonLayer?.isHidden = true
@@ -913,6 +914,29 @@ extension KMLeftSideViewController {
                 self.filterButtonLayer?.isHidden = false
             }
             
+            var hasMark = false
+            var hasReview = false
+            for data in stateArr  {
+                let state = data.intValue
+                if state == CPDFAnnotationState.marked.rawValue || state == CPDFAnnotationState.unMarked.rawValue {
+                    hasMark = true
+                }
+                if state == CPDFAnnotationState.none.rawValue || state == CPDFAnnotationState.accepted.rawValue || state == CPDFAnnotationState.rejected.rawValue || state == CPDFAnnotationState.canceled.rawValue || state == CPDFAnnotationState.completed.rawValue {
+                    hasReview = true
+                }
+            }
+            if hasMark == false {
+                stateArr.append(NSNumber(value: CPDFAnnotationState.marked.rawValue))
+                stateArr.append(NSNumber(value: CPDFAnnotationState.unMarked.rawValue))
+            }
+            if hasReview == false {
+                stateArr.append(NSNumber(value: CPDFAnnotationState.none.rawValue))
+                stateArr.append(NSNumber(value: CPDFAnnotationState.accepted.rawValue))
+                stateArr.append(NSNumber(value: CPDFAnnotationState.rejected.rawValue))
+                stateArr.append(NSNumber(value: CPDFAnnotationState.canceled.rawValue))
+                stateArr.append(NSNumber(value: CPDFAnnotationState.completed.rawValue))
+            }
+            
             var annotationArray: [CPDFAnnotation] = []
             var allAnnotation: [CPDFAnnotation] = []
             for i in 0 ..< self.pageCount() {