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

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

@@ -237,9 +237,9 @@
     } else if ([annotation isKindOfClass:[CSelfSignAnnotation class]]) {
         CSelfSignAnnotation *newAnnotation = (CSelfSignAnnotation *)annotation;
         if (newAnnotation.annotationType == CAnnotationTypeSignFalse) {
-            self.titleLabel.stringValue = NSLocalizedString(@"Fork", nil);
+            self.titleLabel.stringValue = NSLocalizedString(@"X", nil);
         } else if (newAnnotation.annotationType == CAnnotationTypeSignTure) {
-            self.titleLabel.stringValue = NSLocalizedString(@"Hook", nil);
+            self.titleLabel.stringValue = NSLocalizedString(@"Check mark", nil);
         } else if (newAnnotation.annotationType == CAnnotationTypeSignCircle) {
             self.titleLabel.stringValue = NSLocalizedString(@"Rectangle", nil);
         } else if (newAnnotation.annotationType == CAnnotationTypeSignLine) {
@@ -304,9 +304,9 @@
         self.contentViewController = vc;
         vc.callback = ^(CAnnotationType type) {
             if (type == CAnnotationTypeSignFalse) {
-                self.titleLabel.stringValue = NSLocalizedString(@"Fork", nil);
+                self.titleLabel.stringValue = NSLocalizedString(@"X", nil);
             } else if (type == CAnnotationTypeSignTure) {
-                self.titleLabel.stringValue = NSLocalizedString(@"Hook", nil);
+                self.titleLabel.stringValue = NSLocalizedString(@"Check mark", nil);
             } else if (type == CAnnotationTypeSignCircle) {
                 self.titleLabel.stringValue = NSLocalizedString(@"Rectangle", nil);
             } else if (type == CAnnotationTypeSignLine) {
@@ -350,9 +350,9 @@
             self.contentViewController = vc;
             vc.callBack = ^(CAnnotationType type) {
                 if (type == CAnnotationTypeSignFalse) {
-                    self.titleLabel.stringValue = NSLocalizedString(@"Fork", nil);
+                    self.titleLabel.stringValue = NSLocalizedString(@"X", nil);
                 } else if (type == CAnnotationTypeSignTure) {
-                    self.titleLabel.stringValue = NSLocalizedString(@"Hook", nil);
+                    self.titleLabel.stringValue = NSLocalizedString(@"Check mark", nil);
                 } else if (type == CAnnotationTypeSignCircle) {
                     self.titleLabel.stringValue = NSLocalizedString(@"Rectangle", nil);
                 } else if (type == CAnnotationTypeSignLine) {
@@ -523,9 +523,9 @@
     else if (annotationMode == CAnnotationTypeSignCircle)
         title = NSLocalizedString(@"Rectangle", @"Description for export");
     else if (annotationMode == CAnnotationTypeSignFalse)
-        title = NSLocalizedString(@"Fork", nil);
+        title = NSLocalizedString(@"X", nil);
     else if (annotationMode == CAnnotationTypeSignTure)
-        title = NSLocalizedString(@"Hook", nil);
+        title = NSLocalizedString(@"Check mark", nil);
     else if (annotationMode == CAnnotationTypeSignText)
         title = NSLocalizedString(@"Text", nil);
     else if (annotationMode == CAnnotationTypeSignDate)
@@ -605,9 +605,9 @@
         self.contentViewController = vc;
         vc.callBack = ^(CAnnotationType type) {
             if (type == CAnnotationTypeSignFalse) {
-                self.titleLabel.stringValue = NSLocalizedString(@"Fork", nil);
+                self.titleLabel.stringValue = NSLocalizedString(@"X", nil);
             } else if (type == CAnnotationTypeSignTure) {
-                self.titleLabel.stringValue = NSLocalizedString(@"Hook", nil);
+                self.titleLabel.stringValue = NSLocalizedString(@"Check mark", nil);
             } else if (type == CAnnotationTypeSignCircle) {
                 self.titleLabel.stringValue = NSLocalizedString(@"Rectangle", nil);
             } else if (type == CAnnotationTypeSignLine) {

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

@@ -542,7 +542,7 @@ let KMColorPickerViewHeight: CGFloat = 64
                 fillColorPickerView.color = annotationModel?.color()
             }
             fontViewCorloPV.color = annotationModel?.fontColor()
-            fontSizeComboBox.stringValue = String(format: "%0.1f pt", (annotationModel?.fontSize())!)
+            fontSizeComboBox.stringValue = String(format: "%.f pt", (annotationModel?.fontSize())!)
         } else if annotationType == .highlight || annotationType == .strikeOut || annotationType == .underline || annotationType == .anchored {
             textColorPickerView.setColor(color)
         }

PDF Office/PDF Master/Strings/en.lproj/Localizable.strings

@@ -233,6 +233,7 @@
 "Line" = "Line";
 "Dot" = "Dot";
 "Date" = "Date";
+"Check mark" = "Check mark";
 "Add a handwritten signature or create a signature via the trackpad" = "Add a handwritten signature or create a signature via the trackpad";
 
 // MARK: 工具
@@ -3992,3 +3993,4 @@
 "Scanned PDF files are not supported" = "Scanned PDF files are not supported";
 "Limit document size to 10M, document page number to 30, 10w characters per month." = "Limit document size to 10M, document page number to 30, 10w characters per month.";
 "Documents cannot exceed 30 pages" = "Documents cannot exceed 30 pages";
+