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

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/Common/KMPDFConvertManager.swift

@@ -224,6 +224,8 @@ class KMPDFConvertManager: NSObject {
             return NSLocalizedString("GoanKonkani", comment: "")
         case .saudiArabia:
             return NSLocalizedString("SaudiArabia", comment: "")
+        @unknown default:
+            return ""
         }
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m

@@ -400,7 +400,7 @@
         self.contentViewController = vc;
     }
     
-    self.buttonbuttonLayoutConstraint.constant = self.buttonView.hidden ? -36 : 0;
+//    self.buttonbuttonLayoutConstraint.constant = self.buttonView.hidden ? -36 : 0;
 }
 
 - (void)selectAnnotations:(NSArray *)annotations {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -433,7 +433,9 @@ let KMColorPickerViewHeight: CGFloat = 64
         } else {
             annotationColor = annotationModel?.color()
         }
-        guard let color = annotationColor else { return }
+        
+        let color = annotationColor ?? NSColor.black
+//        guard let color = annotationColor else { return }
         var opacity: CGFloat = 1.0
         color.usingColorSpaceName(.calibratedRGB)?.getRed(nil, green: nil, blue: nil, alpha: &opacity)
         if annotationType == .signFalse ||