Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Status_Sel_new.colorset/Contents.json

@@ -4,10 +4,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-            "alpha" : "1.000",
-            "blue" : "107",
-            "green" : "65",
-            "red" : "37"
+            "alpha" : "0.200",
+            "blue" : "230",
+            "green" : "130",
+            "red" : "73"
         }
       },
       "idiom" : "universal"
@@ -22,10 +22,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-            "alpha" : "0.300",
-            "blue" : "255",
-            "green" : "122",
-            "red" : "34"
+            "alpha" : "1.000",
+            "blue" : "107",
+            "green" : "65",
+            "red" : "37"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/PDFTools/FindSearch/KMSearchFindView.swift

@@ -154,6 +154,8 @@ class KMSearchFindView: KMBaseXibView {
     }
 
     @IBAction func toggleCaseInsensitiveFind(_ sender: Any) {
+//        let caseInsensitive = UserDefaults.standard.bool(forKey: SKCaseInsensitiveFindKey)
+//        UserDefaults.standard.set(!caseInsensitive, forKey: SKCaseInsensitiveFindKey)
         let caseInsensitive = UserDefaults.standard.bool(forKey: SKCaseInsensitiveFindKey)
         UserDefaults.standard.set(!caseInsensitive, forKey: SKCaseInsensitiveFindKey)
     }

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFStampAnnotation+PDFListView.swift

@@ -11,7 +11,7 @@ import Foundation
     class func annotationImage(annotationModel: CPDFAnnotationModel) -> NSImage? {
         var image: NSImage?
 //        let bounds = CGRectMake(0, 0, annotationModel.noteWidth(), annotationModel.noteHeight())
-        let bounds = CGRectMake(0, 0, 64, 64)
+        let bounds = CGRectMake(0, 0, 20, 20)
         image = NSImage(size: bounds.size)
         image?.lockFocus()
         NSGraphicsContext.current?.imageInterpolation = .high

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/KMAnnotationSelfSignViewController.swift

@@ -137,13 +137,13 @@ typealias KMAnnotationSelfSignViewControllerCallBack = (CAnnotationType) -> Void
     
     var annotation: CSelfSignAnnotation? {
         get {
-            return ((annotationModel?.annotation)! as! CSelfSignAnnotation)
+            return annotationModel?.annotation as? CSelfSignAnnotation
         }
     }
     
     var annotations: [CSelfSignAnnotation] {
         get {
-            return annotationModel?.annotations as! [CSelfSignAnnotation]
+            return annotationModel?.annotations as? [CSelfSignAnnotation] ?? []
         }
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift

@@ -152,9 +152,9 @@ class KMEditImagePropertyViewController: NSViewController {
         self.opacityTitleLabel.textColor = KMAppearance.Layout.h0Color()
         
         self.imageBox.borderWidth = 1
-        self.imageBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+//        self.imageBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
         self.imageBox.cornerRadius = 4
-        self.imageBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
+//        self.imageBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
         
         self.imageBox.borderColor = KMAppearance.Interactive.s0Color()
         self.imageBox.fillColor = KMAppearance.Layout.l1Color()
@@ -170,10 +170,19 @@ class KMEditImagePropertyViewController: NSViewController {
         opacityVC?.addItems(withObjectValues: ["25%","50%","75%","100%"])
         opacityVC?.selectItem(at: 0)
         opacityVC?.delete = self
-//        opacityVC?.background = KMAppearance.Layout.l1Color()
-//        opacityVC?.background_hov = KMAppearance.Layout.l1Color()
-//        opacityVC?.textColor = KMAppearance.Layout.h0Color()
-//        opacityVC?.textColor_hov = KMAppearance.Layout.h0Color()
+        opacityVC?.borderColor = KMAppearance.Interactive.s0Color()
+        opacityVC?.borderColor_disabled = KMAppearance.Interactive.s0Color()
+        opacityVC?.background = KMAppearance.Layout.l1Color()
+        opacityVC?.background_hov = KMAppearance.Layout.l1Color()
+        opacityVC?.background_focus = KMAppearance.Layout.l1Color()
+        opacityVC?.background_disabled = KMAppearance.Layout.l1Color()
+        opacityVC?.textColor = KMAppearance.Layout.h1Color()
+        opacityVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        opacityVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        opacityVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        opacityVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        opacityVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        opacityVC?.updateUI()
         
         
         
@@ -185,6 +194,7 @@ class KMEditImagePropertyViewController: NSViewController {
         rotateLeftVC?.action = #selector(leftRotationImageAction)
         rotateLeftVC?.image = NSImage(named: "KMImageNameEditPDFRotationLeft")!
         rotateLeftVC?._image_disabled = NSImage(named: "KMImageNameEditPDFRotationLeft")!
+        rotateLeftVC?.background_hov = KMAppearance.Interactive.s0Color()
         rotateLeftVC?.updateUI()
         
         rotateRightVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
@@ -193,6 +203,7 @@ class KMEditImagePropertyViewController: NSViewController {
         rotateRightVC?.target = self
         rotateRightVC?.action = #selector(rightRotationImageAction)
         rotateRightVC?.image = NSImage(named: "KMImageNameEditPDFRotationRight")!
+        rotateRightVC?.background_hov = KMAppearance.Interactive.s0Color()
         rotateRightVC?.updateUI()
         
         flipHorizontalVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
@@ -201,6 +212,7 @@ class KMEditImagePropertyViewController: NSViewController {
         flipHorizontalVC?.target = self
         flipHorizontalVC?.action = #selector(flipHorizontalImageAction)
         flipHorizontalVC?.image = NSImage(named: "KMImageNameEditPDFFlipHorizontal")!
+        flipHorizontalVC?.background_hov = KMAppearance.Interactive.s0Color()
         flipHorizontalVC?.updateUI()
         
         flipVerticalVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
@@ -209,6 +221,7 @@ class KMEditImagePropertyViewController: NSViewController {
         flipVerticalVC?.target = self
         flipVerticalVC?.action = #selector(flipVerticalImageAction)
         flipVerticalVC?.image = NSImage(named: "KMImageNameEditPDFFlipVertical")!
+        flipVerticalVC?.background_hov = KMAppearance.Interactive.s0Color()
         flipVerticalVC?.updateUI()
         
         // 设置默认状态下的滑块图像
@@ -230,11 +243,14 @@ class KMEditImagePropertyViewController: NSViewController {
         cropVC?.action = #selector(cutImageAction)
         cropVC?.button(type: .Sec, size: .m)
         cropVC?.stringValue = NSLocalizedString("Crop", comment: "")
+        cropVC?.borderColor = KMAppearance.Interactive.s0Color()
+        cropVC?.background = KMAppearance.Layout.l1Color()
+        cropVC?.background_hov = KMAppearance.Layout.l1Color()
+        cropVC?.background_focus = KMAppearance.Layout.l1Color()
+        cropVC?.textColor = KMAppearance.Layout.h1Color()
+        cropVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        cropVC?.textColor_focus = KMAppearance.Layout.h1Color()
         cropVC?.updateUI()
-//        cropVC?.textColor = KMAppearance.Layout.h0Color()
-//        cropVC?.textColor_hov = KMAppearance.Layout.h0Color()
-//        cropVC?.background = KMAppearance.Layout.l1Color()
-//        cropVC?.background_hov = KMAppearance.Layout.l1Color()
         
         
         confirmVC = KMDesignButton.init(withType: .Text)
@@ -243,13 +259,15 @@ class KMEditImagePropertyViewController: NSViewController {
         confirmVC?.target = self
         confirmVC?.action = #selector(confirmVCImageAction)
         confirmVC?.button(type: .Cta, size: .m)
-        confirmVC?.stringValue = NSLocalizedString("Confirm Cut", comment: "")
+        confirmVC?.stringValue = NSLocalizedString("Confirm", comment: "")
+        confirmVC?.borderColor = KMAppearance.Interactive.s0Color()
+        confirmVC?.background = KMAppearance.Layout.l1Color()
+        confirmVC?.background_hov = KMAppearance.Layout.l1Color()
+        confirmVC?.background_focus = KMAppearance.Layout.l1Color()
+        confirmVC?.textColor = KMAppearance.Layout.h1Color()
+        confirmVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        confirmVC?.textColor_focus = KMAppearance.Layout.h1Color()
         confirmVC?.updateUI()
-        confirmVC?.button.keyEquivalent = KMKeyEquivalent.enter
-//        confirmVC?.textColor = KMAppearance.Layout.h0Color()
-//        confirmVC?.textColor_hov = KMAppearance.Layout.h0Color()
-//        confirmVC?.background = KMAppearance.Layout.l1Color()
-//        confirmVC?.background_hov = KMAppearance.Layout.l1Color()
         
         
         cancelVC = KMDesignButton.init(withType: .Text)
@@ -259,11 +277,14 @@ class KMEditImagePropertyViewController: NSViewController {
         cancelVC?.action = #selector(cancelCutImageAction)
         cancelVC?.button(type: .Sec, size: .m)
         cancelVC?.stringValue = NSLocalizedString("Cancel", comment: "")
+        cancelVC?.borderColor = KMAppearance.Interactive.s0Color()
+        cancelVC?.background = KMAppearance.Layout.l1Color()
+        cancelVC?.background_hov = KMAppearance.Layout.l1Color()
+        cancelVC?.background_focus = KMAppearance.Layout.l1Color()
+        cancelVC?.textColor = KMAppearance.Layout.h1Color()
+        cancelVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        cancelVC?.textColor_focus = KMAppearance.Layout.h1Color()
         cancelVC?.updateUI()
-//        cancelVC?.textColor = KMAppearance.Layout.h0Color()
-//        cancelVC?.textColor_hov = KMAppearance.Layout.h0Color()
-//        cancelVC?.background = KMAppearance.Layout.l1Color()
-//        cancelVC?.background_hov = KMAppearance.Layout.l1Color()
         
         replaceVC = KMDesignButton.init(withType: .Text)
         replaceBox.contentView = replaceVC?.view
@@ -272,11 +293,17 @@ class KMEditImagePropertyViewController: NSViewController {
         replaceVC?.action = #selector(replaceImageAction)
         replaceVC?.button(type: .Sec, size: .m)
         replaceVC?.stringValue = NSLocalizedString("Replace", comment: "")
+        replaceVC?.borderColor = KMAppearance.Interactive.s0Color()
+        replaceVC?.borderColor_hov = KMAppearance.Interactive.s0Color()
+        replaceVC?.borderColor_disabled = KMAppearance.Interactive.s0Color()
+        replaceVC?.background = KMAppearance.Layout.l1Color()
+        replaceVC?.background_hov = KMAppearance.Layout.l1Color()
+        replaceVC?.background_focus = KMAppearance.Layout.l1Color()
+        replaceVC?.background_disabled = KMAppearance.Layout.l1Color()
+        replaceVC?.textColor = KMAppearance.Layout.h1Color()
+        replaceVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        replaceVC?.textColor_focus = KMAppearance.Layout.h1Color()
         replaceVC?.updateUI()
-//        replaceVC?.textColor = KMAppearance.Layout.h0Color()
-//        replaceVC?.textColor_hov = KMAppearance.Layout.h0Color()
-//        replaceVC?.background = KMAppearance.Layout.l1Color()
-//        replaceVC?.background_hov = KMAppearance.Layout.l1Color()
         
         exportVC = KMDesignButton.init(withType: .Text)
         exportBox.contentView = exportVC?.view
@@ -285,11 +312,17 @@ class KMEditImagePropertyViewController: NSViewController {
         exportVC?.action = #selector(exportImageAction)
         exportVC?.button(type: .Sec, size: .m)
         exportVC?.stringValue = NSLocalizedString("Export", comment: "")
+        exportVC?.borderColor = KMAppearance.Interactive.s0Color()
+        exportVC?.borderColor_hov = KMAppearance.Interactive.s0Color()
+        exportVC?.borderColor_disabled = KMAppearance.Interactive.s0Color()
+        exportVC?.background = KMAppearance.Layout.l1Color()
+        exportVC?.background_hov = KMAppearance.Layout.l1Color()
+        exportVC?.background_focus = KMAppearance.Layout.l1Color()
+        exportVC?.background_disabled = KMAppearance.Layout.l1Color()
+        exportVC?.textColor = KMAppearance.Layout.h1Color()
+        exportVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        exportVC?.textColor_focus = KMAppearance.Layout.h1Color()
         exportVC?.updateUI()
-//        exportVC?.textColor = KMAppearance.Layout.h0Color()
-//        exportVC?.textColor_hov = KMAppearance.Layout.h0Color()
-//        exportVC?.background = KMAppearance.Layout.l1Color()
-//        exportVC?.background_hov = KMAppearance.Layout.l1Color()
         
         self.noTitleLabel.textColor = NSColor.km_init(hex: "#616469")
         self.noTitleLabel.font = NSFont.SFProTextRegularFont(14)
@@ -313,7 +346,7 @@ class KMEditImagePropertyViewController: NSViewController {
         
         self.opacityTitleLabel.stringValue = NSLocalizedString("Opacity", comment: "")
         self.cropVC?.stringValue = NSLocalizedString("Crop", comment: "")
-        self.confirmVC?.stringValue = NSLocalizedString("Confirm Crop", comment: "")
+        self.confirmVC?.stringValue = NSLocalizedString("Confirm", comment: "")
         self.cancelVC?.stringValue = NSLocalizedString("Cancel", comment: "")
         self.replaceVC?.stringValue = NSLocalizedString("Replace", comment: "")
         self.exportVC?.stringValue = NSLocalizedString("Export", comment: "")

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -178,6 +178,8 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         leftAlignmentVC?.action = #selector(leftAlignmentAction)
         leftAlignmentVC?.image = NSImage(named: "KMImageNameEditPDFAlignLeft")!
         leftAlignmentVC?.image_sel = NSImage(named: "KMImageNameEditPDFAlignLeftSelect")!
+        leftAlignmentVC?.background_hov = KMAppearance.Layout.l1Color()
+        leftAlignmentVC?.background_sel = KMAppearance.Layout.l1Color()
         leftAlignmentVC?.updateUI()
         
         centerAlignmentVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
@@ -187,6 +189,8 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         centerAlignmentVC?.action = #selector(centerAlignmentAction)
         centerAlignmentVC?.image = NSImage(named: "KMImageNameEditPDFAlignCenter")!
         centerAlignmentVC?.image_sel = NSImage(named: "KMImageNameEditPDFAlignCenterSelect")!
+        centerAlignmentVC?.background_hov = KMAppearance.Layout.l1Color()
+        centerAlignmentVC?.background_sel = KMAppearance.Layout.l1Color()
         centerAlignmentVC?.updateUI()
         
         rightAlignmentVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
@@ -196,9 +200,11 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         rightAlignmentVC?.action = #selector(rightAlignmentAction)
         rightAlignmentVC?.image = NSImage(named: "KMImageNameEditPDFAlignRight")!
         rightAlignmentVC?.image_sel = NSImage(named: "KMImageNameEditPDFAlignRightSelect")!
+        rightAlignmentVC?.background_hov = KMAppearance.Layout.l1Color()
+        rightAlignmentVC?.background_sel = KMAppearance.Layout.l1Color()
         rightAlignmentVC?.updateUI()
         
-        var fontNameArray = KMEditPDFTextManager.manager.fetchTextFontNames()
+        let fontNameArray = KMEditPDFTextManager.manager.fetchTextFontNames()
         
         fontNameVC = KMDesignSelect.init(withType: .PopButton)
 //        fontNameVC?.isScrollPop = true
@@ -282,8 +288,11 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         textPresuppositionResetVC?.target = self
         textPresuppositionResetVC?.action = #selector(resetTextPresuppositionButtonAction)
         textPresuppositionResetVC?.image = NSImage(named: "KMImagePropertPanelTextDefaultMore")!
+        textPresuppositionResetVC?.background_hov = KMAppearance.Layout.l1Color()
+        textPresuppositionResetVC?.updateUI()
         
-        self.colorBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+//        self.colorBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        self.colorBox.borderColor = KMAppearance.Interactive.s0Color()
         
         self.alignmentView.didChange = { [unowned self] view, areasArray, boundsArray in
             self.changeAreasAlign(areas: areasArray, newBounds: boundsArray)

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSigntureViewItem.swift

@@ -32,6 +32,12 @@ import Cocoa
         self.deleteIconBtn.isHidden = true
 
         tableViewMenu()
+        
+        DistributedNotificationCenter.default().addObserver(self, selector: #selector(themeChanged(notification:)), name: NSNotification.Name("AppleInterfaceThemeChangedNotification"), object: nil)
+    }
+    
+    deinit {
+        DistributedNotificationCenter.default().removeObserver(self)
     }
 
     func tableViewMenu() {
@@ -55,24 +61,49 @@ import Cocoa
 
     var isSelect: Bool = false {
         didSet {
+           updateBgColor()
+        }
+    }
+
+    @objc func themeChanged(notification: NSNotification) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+            self.updateBgColor()
+        }
+    }
+    
+    func updateBgColor() {
+        if KMAppearance.isDarkMode() {
             if isSelect {
-                self.contendView.layer?.borderColor = KMAppearance.Status.selColorNew().cgColor//NSColor(red: 206/255, green: 208/255, blue: 212/255, alpha: 0.6).cgColor
-                self.contendView.layer?.backgroundColor = KMAppearance.Status.selColorNew().cgColor//NSColor(red: 206/255, green: 208/255, blue: 212/255, alpha: 1).cgColor
+                self.contendView.layer?.borderColor = NSColor(red: 37/255.0, green: 65/255.0, blue: 107/255.0, alpha: 1.0).cgColor
+                self.contendView.layer?.backgroundColor = NSColor(red: 37/255.0, green: 65/255.0, blue: 107/255.0, alpha: 1.0).cgColor
+            } else {
+                self.contendView.layer?.borderColor = NSColor.clear.cgColor
+                self.contendView.layer?.backgroundColor = NSColor.clear.cgColor
+            }
+        }else {
+            if isSelect {
+                self.contendView.layer?.borderColor = NSColor(red: 217/255.0, green: 228/255.0, blue: 250/255.0, alpha: 1.0).cgColor
+                self.contendView.layer?.backgroundColor = NSColor(red: 217/255.0, green: 228/255.0, blue: 250/255.0, alpha: 1.0).cgColor
             } else {
                 self.contendView.layer?.borderColor = NSColor.clear.cgColor
                 self.contendView.layer?.backgroundColor = NSColor.clear.cgColor
             }
         }
     }
-
+    
     override func mouseEntered(with event: NSEvent) {
         super.mouseEntered(with: event)
 
         if isSelect {
 
         } else {
-            self.contendView.layer?.borderColor = KMAppearance.Status.selColorNew().cgColor//NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1).cgColor
-            self.contendView.layer?.backgroundColor = KMAppearance.Status.selColorNew().cgColor//NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1).cgColor
+            if KMAppearance.isDarkMode() {
+                self.contendView.layer?.borderColor = NSColor(red: 37/255.0, green: 65/255.0, blue: 107/255.0, alpha: 1.0).cgColor
+                self.contendView.layer?.backgroundColor = NSColor(red: 37/255.0, green: 65/255.0, blue: 107/255.0, alpha: 1.0).cgColor
+            }else {
+                self.contendView.layer?.borderColor = NSColor(red: 217/255.0, green: 228/255.0, blue: 250/255.0, alpha: 1.0).cgColor
+                self.contendView.layer?.backgroundColor = NSColor(red: 217/255.0, green: 228/255.0, blue: 250/255.0, alpha: 1.0).cgColor
+            }
         }
     }
 

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -2217,8 +2217,8 @@ extension KMToolbarViewController {
         var value = KMDataManager.ud_integer(forKey: SKCaseInsensitiveSearchKey)
         KMDataManager.ud_set(value == 0 ? 1 : 0, forKey: SKCaseInsensitiveSearchKey)
         
-        let caseInsensitive = UserDefaults.standard.bool(forKey: "SKCaseInsensitiveFindKey")
-        UserDefaults.standard.set(!caseInsensitive, forKey: "SKCaseInsensitiveFindKey")
+//        let caseInsensitive = UserDefaults.standard.bool(forKey: "SKCaseInsensitiveFindKey")
+//        UserDefaults.standard.set(!caseInsensitive, forKey: "SKCaseInsensitiveFindKey")
         
         self.searchPDFKey(self.searchField.stringValue)
     }
@@ -2261,9 +2261,4 @@ extension KMToolbarViewController {
         
         refreshSearchBarMenu()
     }
-
-//    @IBAction func toggleCaseInsensitiveFind(_ sender: Any) {
-//        let caseInsensitive = UserDefaults.standard.bool(forKey: "SKCaseInsensitiveFindKey")
-//        UserDefaults.standard.set(!caseInsensitive, forKey: "SKCaseInsensitiveFindKey")
-//    }
 }

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -4824,7 +4824,8 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     
     func toolbarViewController(_ viewController: KMToolbarViewController, searchAction searchString: String, forward: Bool) {
 //        if self.searchResults.count == 0 {
-            let caseInsensitive = UserDefaults.standard.bool(forKey: "SKCaseInsensitiveFindKey")
+//            let caseInsensitive = UserDefaults.standard.bool(forKey: "SKCaseInsensitiveFindKey")
+        let caseInsensitive = UserDefaults.standard.bool(forKey: SKCaseInsensitiveSearchKey)
             self.search(searchString: searchString, isCase: !caseInsensitive, display: false)
 //        }
         
@@ -4849,7 +4850,8 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     
     func toolbarViewController(_ viewController: KMToolbarViewController, searchAllAction searchString: String, forward: Bool) {
 //        if self.searchResults.count == 0 {
-            let caseInsensitive = UserDefaults.standard.bool(forKey: "SKCaseInsensitiveFindKey")
+//            let caseInsensitive = UserDefaults.standard.bool(forKey: "SKCaseInsensitiveFindKey")
+        let caseInsensitive = UserDefaults.standard.bool(forKey: SKCaseInsensitiveSearchKey)
             self.search(searchString: searchString, isCase: !caseInsensitive, display: false, needShowAll: true)
 //        }