Browse Source

【注释】旧版数据兼容

wanjun 10 months ago
parent
commit
261c0b6b73

+ 34 - 34
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CStringConstants.m

@@ -132,46 +132,46 @@ NSString *CAnnotationTextWidgetLineWidthKey = @"CAnnotationTextWidgetLineWidthKe
 NSString *CAnnotationTextWidgetBorderColorKey = @"CAnnotationTextWidgetBorderColor";
 NSString *SKAnnotationTextWidgetFontNameKey = @"SKAnnotationTextWidgetFontNameKey";
 NSString *SKAnnotationTextWidgetFontSizeKey = @"SKAnnotationTextWidgetFontSizeKey";
-NSString *CAnnotationTextWidgetFontColorKey = @"CAnnotationTextWidgetFontColor";
-NSString *CAnnotationTextWidgetAlignmenKey = @"CAnnotationTextWidgetAlignmen";
-NSString *CAnnotationTextWidgetBackgroundColorKey = @"CAnnotationTextWidgetBackgroundColor";
+NSString *CAnnotationTextWidgetFontColorKey = @"SKAnnotationTextWidgetFontColorKey";
+NSString *CAnnotationTextWidgetAlignmenKey = @"SKAnnotationTextWidgetAlignmenKey";
+NSString *CAnnotationTextWidgetBackgroundColorKey = @"SKAnnotationTextWidgetBackgroundColorKey";
 NSString *CAnnotationTextWidgetBackgroundOpacityKey = @"CAnnotationTextWidgetBackgroundOpacity";
-NSString *CAnnotationTextWidgetMultilineKey = @"CAnnotationTextWidgetMultiline";
+NSString *CAnnotationTextWidgetMultilineKey = @"SKAnnotationTextMultilineKey";
 NSString *CDefaultTextWidgetWidthKey = @"CDefaultTextWidgetWidth";
 NSString *CDefaultTextWidgetHeightKey = @"CDefaultTextWidgetHeight";
 
 NSString *CAnnotationCheckBoxWidgetLineStyleKey = @"CAnnotationCheckBoxWidgetLineStyle";
 NSString *CAnnotationCheckBoxWidgetLineWidthKey = @"CAnnotationCheckBoxWidgetLineWidth";
 NSString *CAnnotationCheckBoxWidgetBorderColorKey = @"CAnnotationCheckBoxWidgetBorderColor";
-NSString *CAnnotationCheckBoxWidgetBackgroundColorKey = @"CAnnotationCheckBoxWidgetBackgroundColor";
+NSString *CAnnotationCheckBoxWidgetBackgroundColorKey = @"SKAnnotationCheckBoxWidgetBackgroundColorKey";
 NSString *CAnnotationCheckBoxWidgetBackgroundOpacityKey = @"CAnnotationCheckBoxWidgetBackgroundOpacity";
 
 NSString *CAnnotationRadioButtonBoxWidgetLineStyleKey = @"CAnnotationRadioButtonBoxWidgetLineStyle";
 NSString *CAnnotationRadioButtonBoxWidgetLineWidthKey = @"CAnnotationRadioButtonBoxWidgetLineWidth";
 NSString *CAnnotationRadioButtonBoxWidgetBorderColorKey = @"CAnnotationRadioButtonBoxWidgetBorderColor";
-NSString *CAnnotationRadioButtonWidgetBackgroundColorKey = @"CAnnotationRadioButtonWidgetBackgroundColor";
+NSString *CAnnotationRadioButtonWidgetBackgroundColorKey = @"SKAnnotationRadioButtonWidgetBackgroundColorKey";
 NSString *CAnnotationRadioButtonWidgetBackgroundOpacityKey = @"CAnnotationRadioButtonWidgetBackgroundOpacity";
 NSString *CDefaultRadioButtonWidgetWidthKey = @"CDefaultRadioButtonWidgetWidth";
 NSString *CDefaultRadioButtonWidgetHeightKey = @"CDefaultRadioButtonWidgetHeight";
-NSString *CAnnotationRadioButtonWidgetFontNameKey = @"CAnnotationRadioButtonWidgetFontNameKey";
+NSString *CAnnotationRadioButtonWidgetFontNameKey = @"SKAnnotationRadioButtonWidgetFontNameKey";
 
 NSString *CAnnotationChoiceListWidgetLineStyleKey = @"CAnnotationChoiceListWidgetLineStyle";
 NSString *CAnnotationChoiceListWidgetLineWidthKey = @"CAnnotationChoiceListWidgetLineWidth";
 NSString *CAnnotationChoiceListWidgetBorderColorKey = @"CAnnotationChoiceListWidgetBorderColor";
-NSString *CAnnotationChoiceListWidgetFontNameKey = @"CAnnotationChoiceListWidgetFontNameKey";
-NSString *CAnnotationChoiceListWidgetFontSizeKey = @"CAnnotationChoiceWidgetFontSize";
-NSString *CAnnotationChoiceListWidgetFontColorKey = @"CAnnotationChoiceWidgetFontColor";
-NSString *CAnnotationChoiceListWidgetBackgroundColorKey = @"CAnnotationChoiceListWidgetBackgroundColor";
+NSString *CAnnotationChoiceListWidgetFontNameKey = @"SKAnnotationChoiceListWidgetFontNameKey";
+NSString *CAnnotationChoiceListWidgetFontSizeKey = @"SKAnnotationChoiceListWidgetFontSizeKey";
+NSString *CAnnotationChoiceListWidgetFontColorKey = @"SKAnnotationChoiceListWidgetFontColorKey";
+NSString *CAnnotationChoiceListWidgetBackgroundColorKey = @"SKAnnotationChoiceListWidgetBackgroundColorKey";
 NSString *CAnnotationChoiceListWidgetBackgroundOpacityKey = @"CAnnotationChoiceListWidgetBackgroundOpacity";
 NSString *CDefaultChoiceListWidgetWidthKey = @"CDefaultChoiceListWidgetWidth";
 NSString *CDefaultChoiceListWidgetHeightKey = @"CDefaultChoiceListWidgetHeight";
 NSString *CAnnotationChoiceWidgetLineStyleKey = @"CAnnotationChoiceWidgetLineStyle";
 NSString *CAnnotationChoiceWidgetLineWidthKey = @"CAnnotationChoiceWidgetLineWidth";
 NSString *CAnnotationChoiceWidgetBorderColorKey = @"CAnnotationChoiceWidgetBorderColor";
-NSString *CAnnotationChoiceWidgetFontNameKey = @"CAnnotationChoiceWidgetFontNameKey";
-NSString *CAnnotationChoiceWidgetFontSizeKey = @"CAnnotationChoiceWidgetFontSize";
-NSString *CAnnotationChoiceWidgetFontColorKey = @"CAnnotationChoiceWidgetFontColor";
-NSString *CAnnotationChoiceWidgetBackgroundColorKey = @"CAnnotationChoiceWidgetBackgroundColor";
+NSString *CAnnotationChoiceWidgetFontNameKey = @"SKAnnotationChoiceWidgetFontNameKey";
+NSString *CAnnotationChoiceWidgetFontSizeKey = @"SKAnnotationChoiceWidgetFontSizeKey";
+NSString *CAnnotationChoiceWidgetFontColorKey = @"SKAnnotationChoiceWidgetFontColorKey";
+NSString *CAnnotationChoiceWidgetBackgroundColorKey = @"SKAnnotationChoiceWidgetBackgroundColorKey";
 NSString *CAnnotationChoiceWidgetBackgroundOpacityKey = @"CAnnotationChoiceWidgetBackgroundOpacity";
 NSString *CDefaultChoiceWidgetWidthKey = @"CDefaultChoiceWidgetWidth";
 NSString *CDefaultChoiceWidgetHeightKey = @"CDefaultChoiceWidgetHeight";
@@ -179,10 +179,10 @@ NSString *CDefaultChoiceWidgetHeightKey = @"CDefaultChoiceWidgetHeight";
 NSString *CAnnotationActionButtonWidgetLineStyleKey = @"CAnnotationActionButtonWidgetLineStyle";
 NSString *CAnnotationActionButtonWidgetLineWidthKey = @"CAnnotationActionButtonWidgetLineWidth";
 NSString *CAnnotationActionButtonWidgetBorderColorKey = @"CAnnotationActionButtonWidgetBorderColor";
-NSString *CAnnotationActionButtonWidgetFontNameKey = @"CAnnotationActionButtonWidgetFontName";
-NSString *CAnnotationActionButtonWidgetFontSizeKey = @"CAnnotationActionButtonWidgetFontSize";
-NSString *CAnnotationActionButtonWidgetFontColorKey = @"CAnnotationActionButtonWidgetFontColor";
-NSString *CAnnotationActionButtonWidgetBackgroundColorKey = @"CAnnotationActionButtonWidgetBackgroundColor";
+NSString *CAnnotationActionButtonWidgetFontNameKey = @"SKAnnotationActionButtonWidgetFontNameKey";
+NSString *CAnnotationActionButtonWidgetFontSizeKey = @"SKAnnotationActionButtonWidgetFontSizeKey";
+NSString *CAnnotationActionButtonWidgetFontColorKey = @"SKAnnotationActionButtonWidgetFontColorKey";
+NSString *CAnnotationActionButtonWidgetBackgroundColorKey = @"SKAnnotationActionButtonWidgetBackgroundColorKey";
 NSString *CAnnotationActionButtonWidgetBackgroundOpacityKey = @"CAnnotationActionButtonWidgetBackgroundOpacity";
 NSString *CDefaultActionButtonWidgetWidthKey = @"CDefaultActionButtonWidgetWidth";
 NSString *CDefaultActionButtonWidgetHeightKey = @"CDefaultActionButtonWidgetHeight";
@@ -197,37 +197,37 @@ NSString *CDefaultSignatureWidgeHeightKey = @"CDefaultSignatureWidgeHeight";
 
 //Fill & Sign
 
-NSString *CAnnotationSelfSignTureColorKey = @"CAnnotationSelfSignTureColor";
+NSString *CAnnotationSelfSignTureColorKey = @"SKAnnotationSelfSignTureColorKey";
 
 NSString *CAnnotationSelfSignTureOpacityKey = @"CAnnotationSelfSignTureOpacity";
 
-NSString *CAnnotationSelfSignTureLineWidthKey = @"CAnnotationSelfSignTureLineWidth";
+NSString *CAnnotationSelfSignTureLineWidthKey = @"SKAnnotationSelfSignTureLineWidthKey";
 
-NSString *CAnnotationSelfSignFalseColorKey = @"CAnnotationSelfSignFalseColor";
+NSString *CAnnotationSelfSignFalseColorKey = @"SKAnnotationSelfSignFalseColorKey";
 
 NSString *CAnnotationSelfSignFalseOpacityKey = @"CAnnotationSelfSignFalseOpacity";
 
-NSString *CAnnotationSelfSignFalseLineWidthKey = @"CAnnotationSelfSignFalseLineWidth";
+NSString *CAnnotationSelfSignFalseLineWidthKey = @"SKAnnotationSelfSignFalseLineWidthKey";
 
-NSString *CAnnotationSelfSignCircleColorKey = @"CAnnotationSelfSignCircleColor";
+NSString *CAnnotationSelfSignCircleColorKey = @"SKAnnotationSelfSignCircleColorKey";
 
 NSString *CAnnotationSelfSignCircleOpacityKey = @"CAnnotationSelfSignCircleOpacity";
 
-NSString *CAnnotationSelfSignCircleLineWidthKey = @"CAnnotationSelfSignCircleLineWidth";
+NSString *CAnnotationSelfSignCircleLineWidthKey = @"SKAnnotationSelfSignCircleLineWidthKey";
 
-NSString *CAnnotationSelfSignLineColorKey = @"CAnnotationSelfSignLineColor";
+NSString *CAnnotationSelfSignLineColorKey = @"SKAnnotationSelfSignLineColorKey";
 
 NSString *CAnnotationSelfSignLineOpacityKey = @"CAnnotationSelfSignLineOpacity";
 
-NSString *CAnnotationSelfSignLineLineWidthKey = @"CAnnotationSelfSignLineLineWidth";
+NSString *CAnnotationSelfSignLineLineWidthKey = @"SKAnnotationSelfSignLineLineWidthKey";
 
-NSString *CAnnotationSelfSignDotColorKey = @"CAnnotationSelfSignDotColor";
+NSString *CAnnotationSelfSignDotColorKey = @"SKAnnotationSelfSignDotColorKey";
 
 NSString *CAnnotationSelfSignDotOpacityKey = @"CAnnotationSelfSignDotOpacity";
 
-NSString *CAnnotationSelfSignDateFormatterKey = @"CAnnotationSelfSignDateFormatter";
+NSString *CAnnotationSelfSignDateFormatterKey = @"SKAnnotationSelfSignDateFormatterKey";
 
-NSString *CAnnotationSelfSignDateFormatterIncludeTimeKey = @"CAnnotationSelfSignDateFormatterIncludeTime";
+NSString *CAnnotationSelfSignDateFormatterIncludeTimeKey = @"SKAnnotationSelfSignDateFormatterIncludeTimeKey";
 
 NSString *CDefaultNoteWidthKey = @"SKDefaultNoteWidth";
 
@@ -288,15 +288,15 @@ NSString *CDefaultSignDotNoteHeightKey = @"CDefaultSignDotNoteHeight";
 //Redact
 NSString *CAnnotationRedactBorderColorKey = @"CAnnotationRedactBorderColor";
 
-NSString *CAnnotationRedactFillColorKey = @"CAnnotationRedactFillColor";
+NSString *CAnnotationRedactFillColorKey = @"KMPDFAnnotationRedactFillColor";
 
-NSString *CAnnotationRedactFontColorKey = @"CAnnotationRedactFontColor";
+NSString *CAnnotationRedactFontColorKey = @"KMPDFAnnotationRedactFontColor";
 
 NSString *CAnnotationRedactIsOverlayTextKey = @"CAnnotationRedactIsOverlayText";
 
-NSString *CAnnotationRedactTextAlignmentKey = @"CAnnotationRedactTextAlignment";
+NSString *CAnnotationRedactTextAlignmentKey = @"KMPDFAnnotationRedactTextAlignment";
 
-NSString *CAnnotationRedactFontSizeKey = @"CAnnotationRedactFontSize";
+NSString *CAnnotationRedactFontSizeKey = @"KMPDFAnnotationRedactFontSize";
 
 NSString *CAnnotationRedactOverlayStringKey = @"CAnnotationRedactOverlayString";