Преглед на файлове

注释 - 对应底层库支持的字体样式

chenrongqian@kdanmobile.com преди 2 години
родител
ревизия
700068960c
променени са 2 файла, в които са добавени 55 реда и са изтрити 3 реда
  1. 54 2
      PDF Office/Model/PropertyPanel/AnnotPanel/FontStyleItem.cs
  2. 1 1
      PDF Office/ViewModels/PropertyPanel/FontBoardVM.cs

+ 54 - 2
PDF Office/Model/PropertyPanel/AnnotPanel/FontStyleItem.cs

@@ -230,12 +230,64 @@ namespace PDF_Office.Model.PropertyPanel.AnnotPanel
             var FontFamilyItems = new List<ComboDataItem>();
             ComboDataItem item = new ComboDataItem("Courier", "Courier New");
             FontFamilyItems.Add(item);
-            item = new ComboDataItem("Helvetica", "Helvetica");
+            item = new ComboDataItem("Arial", "Helvetica");
             FontFamilyItems.Add(item);
-            item = new ComboDataItem("Times-Roman", "Times New Roman");
+            item = new ComboDataItem(/*"Times-Roman"*/"Times", "Times New Roman");
             FontFamilyItems.Add(item);
 
             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;
+
+
+
+
+
+
+
         }
     }
    

+ 1 - 1
PDF Office/ViewModels/PropertyPanel/FontBoardVM.cs

@@ -375,7 +375,7 @@ namespace PDF_Office.ViewModels.PropertyPanel
         #region 字体样式
 
         //下拉框列表
-        private ComboDataItem _currentFontFamily = new ComboDataItem("Helvetica", "Helvetica");
+        private ComboDataItem _currentFontFamily = new ComboDataItem("Arial", "Helvetica");
         public ComboDataItem CurrentFontFamily
         {
             get { return _currentFontFamily; }