|
@@ -230,12 +230,64 @@ namespace PDF_Office.Model.PropertyPanel.AnnotPanel
|
|
var FontFamilyItems = new List<ComboDataItem>();
|
|
var FontFamilyItems = new List<ComboDataItem>();
|
|
ComboDataItem item = new ComboDataItem("Courier", "Courier New");
|
|
ComboDataItem item = new ComboDataItem("Courier", "Courier New");
|
|
FontFamilyItems.Add(item);
|
|
FontFamilyItems.Add(item);
|
|
- item = new ComboDataItem("Helvetica", "Helvetica");
|
|
|
|
|
|
+ item = new ComboDataItem("Arial", "Helvetica");
|
|
FontFamilyItems.Add(item);
|
|
FontFamilyItems.Add(item);
|
|
- item = new ComboDataItem("Times-Roman", "Times New Roman");
|
|
|
|
|
|
+ item = new ComboDataItem(/*"Times-Roman"*/"Times", "Times New Roman");
|
|
FontFamilyItems.Add(item);
|
|
FontFamilyItems.Add(item);
|
|
|
|
|
|
return FontFamilyItems;
|
|
return FontFamilyItems;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static List<ComboDataItem> GetDateFormats()
|
|
|
|
+ {
|
|
|
|
+ var dateFormatItems = new List<ComboDataItem>();
|
|
|
|
+ foreach(var itemFormat in GetTimesFormats())
|
|
|
|
+ {
|
|
|
|
+ ComboDataItem item = new ComboDataItem(itemFormat, "format");
|
|
|
|
+ dateFormatItems.Add(item);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return dateFormatItems;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private static List<string> GetTimesFormats()
|
|
|
|
+ {
|
|
|
|
+ List<string> TimesItems = new List<string>();
|
|
|
|
+ TimesItems.Add("yyyy年M月d日");
|
|
|
|
+ TimesItems.Add("M/d");
|
|
|
|
+ TimesItems.Add("M/d/yy");
|
|
|
|
+ TimesItems.Add("M/d/yyyy");
|
|
|
|
+ TimesItems.Add("MM/dd/yy");
|
|
|
|
+ TimesItems.Add("MM/dd/yyyy");
|
|
|
|
+
|
|
|
|
+ TimesItems.Add("d/M/yy");
|
|
|
|
+ TimesItems.Add("d/M/yyyy");
|
|
|
|
+ TimesItems.Add("dd/MM/yy");
|
|
|
|
+ TimesItems.Add("dd/MM/yyyy");
|
|
|
|
+
|
|
|
|
+ TimesItems.Add("MM/yy");
|
|
|
|
+ TimesItems.Add("MM/yyyy");
|
|
|
|
+
|
|
|
|
+ TimesItems.Add("M.d.yy");
|
|
|
|
+ TimesItems.Add("M.d.yyyy");
|
|
|
|
+ TimesItems.Add("MM.dd.yy");
|
|
|
|
+ TimesItems.Add("MM.dd.yyyy");
|
|
|
|
+ TimesItems.Add("MM.yy");
|
|
|
|
+ TimesItems.Add("MM.yyyy");
|
|
|
|
+ TimesItems.Add("d.M.yy");
|
|
|
|
+ TimesItems.Add("d.M.yyyy");
|
|
|
|
+ TimesItems.Add("dd.MM.yy");
|
|
|
|
+ TimesItems.Add("dd.MM.yyyy");
|
|
|
|
+ TimesItems.Add("yy-MM-dd");
|
|
|
|
+ TimesItems.Add("yyyy-MM-dd");
|
|
|
|
+ return TimesItems;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|