Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

# Conflicts:
#	PDF Office/Properties/Settings.Designer.cs
#	PDF Office/Properties/Settings.settings
#	PDFSettings/PDFSettings.csproj

PDF Office/App.xaml.cs

@@ -22,7 +22,7 @@ using Prism.Regions;
 using PDF_Master.Model;
 using PDF_Master.Views.PageEdit;
 using PDF_Master.Properties;
-using PDFSettings.Settings;
+using PDFSettings;
 using PDF_Master.Views.Tools;
 using PDF_Master.Views.Dialog.ToolsDialogs.SaftyDialogs;
 using PDF_Master.Views.Dialog.ToolsDialogs.CompressDialogs;

PDF Office/Helper/SettingHelper.cs

@@ -1,6 +1,6 @@
 using ComPDFKitViewer.AnnotEvent;
 using PDFSettings;
-using PDFSettings.Settings;
+using PDFSettings;
 using System;
 using System.Collections.Generic;
 using System.Security.Cryptography;

PDF Office/Helper/ToolMethod.cs

@@ -1,7 +1,7 @@
 using ComPDFKit.PDFDocument;
 using ComPDFKit.PDFPage;
 using PDF_Master.CustomControl;
-using PDFSettings.Settings;
+using PDFSettings;
 using System;
 using System.Collections.Generic;
 using System.Drawing;

PDF Office/Model/PropertyPanel/AnnotPanel/FontStyleItem.cs

@@ -19,9 +19,12 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
             List<PresetFontItem> cacheTempList = new List<PresetFontItem>();
 
             if (Settings.Default.PresetFontList == null)
-                Settings.Default.PresetFontList = new PresetFontList();
+                Settings.Default.PresetFontList = new PresetFontList();
+
+            if (Settings.Default.PreinstallFontList == null)
+                Settings.Default.PreinstallFontList = new PreinstallFontList();
 
-            if (Settings.Default.PresetFontList.Count == 0)
+            if (Settings.Default.PreinstallFontList.Count == 0/*Settings.Default.PresetFontList.Count == 0*/ )
             {
                 cacheTempList = GetPresetFontStyle();
                 foreach (var cacheItem in cacheTempList)
@@ -34,23 +37,66 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
                     newItem.mFontSize = cacheItem.mFontSize;
                     newItem.mFontFamily = cacheItem.mFontFamily;
                     Settings.Default.PresetFontList.Add(newItem);
+
+                    var newItem1 = new PreinstallItem();
+                    newItem1.mTag = cacheItem.mTag;
+                    newItem1.mTagContent = cacheItem.mTagContent;
+                    newItem1.mFontStyle = cacheItem.mFontStyle.ToString();
+                    newItem1.mFontWeight = cacheItem.mFontWeight.ToString();
+                    newItem1.mFontSize = cacheItem.mFontSize;
+                    newItem1.mFontFamily = cacheItem.mFontFamily.Source;
+                    Settings.Default.PreinstallFontList.Add(newItem1);
                 }
 
                 Settings.Default.Save();
             }
             else
             {
-                foreach (var item in Settings.Default.PresetFontList)
-                {
+                foreach (var item in Settings.Default.PreinstallFontList)
+                {
                     var newItem = new PresetFontItem();
                     newItem.mTag = item.mTag;
                     newItem.mTagContent = item.mTagContent;
-                    newItem.mFontStyle = item.mFontStyle;
-                    newItem.mFontWeight = item.mFontWeight;
+                    switch (item.mFontStyle)
+                    {
+                        case "Normal":
+                            newItem.mFontStyle = FontStyles.Normal;
+                            break;
+
+                        case "Italic":
+                            newItem.mFontStyle = FontStyles.Italic;
+                            break;
+
+                        case "Oblique":
+                            newItem.mFontStyle = FontStyles.Oblique;
+                            break;
+                    }
+                    switch (item.mFontWeight)
+                    {
+                        case "Bold":
+                            newItem.mFontWeight = FontWeights.Bold;
+                            break;
+
+                        case "Normal":
+                            newItem.mFontWeight = FontWeights.Normal;
+                            break;
+                    }
                     newItem.mFontSize = item.mFontSize;
-                    newItem.mFontFamily = item.mFontFamily;
-                    cacheTempList.Add(newItem);
+                    newItem.mFontFamily = new FontFamily(item.mFontFamily);
+
+                    cacheTempList.Add(newItem);
                 }
+                //foreach (var item in Settings.Default.PresetFontList)
+                //{
+                //    var newItem = new PresetFontItem();
+                //    newItem.mTag = item.mTag;
+                //    newItem.mTagContent = item.mTagContent;
+                //    newItem.mFontStyle = item.mFontStyle;
+                //    newItem.mFontWeight = item.mFontWeight;
+                //    newItem.mFontSize = item.mFontSize;
+                //    newItem.mFontFamily = item.mFontFamily;
+                //    cacheTempList.Add(newItem);
+                //}
             }
 
             return cacheTempList;
@@ -62,28 +108,39 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
             if (list == null) return;
 
             if (Settings.Default.PresetFontList == null)
-                Settings.Default.PresetFontList = new PresetFontList();
-
+                Settings.Default.PresetFontList = new PresetFontList();
+
+            if (Settings.Default.PreinstallFontList == null)
+                Settings.Default.PreinstallFontList = new PreinstallFontList();
+
             bool isCanSave = false;
             List<PresetFontItem> TempLists = new List<PresetFontItem>();
 
             foreach (var item in list)
             {
-                var cacheItem = Settings.Default.PresetFontList.FirstOrDefault(temp => temp.mTag == item.mTag);
+                var cacheItem = Settings.Default.PreinstallFontList.FirstOrDefault(temp => temp.mTag == item.mTag);
                 if (cacheItem != null)
                 {
-                    if (cacheItem.mFontFamily.Source != item.mFontFamily.Source ||
+                    if (cacheItem.mFontFamily != item.mFontFamily.Source ||
                        cacheItem.mFontSize != item.mFontSize ||
-                       cacheItem.mFontStyle != item.mFontStyle ||
-                       cacheItem.mFontWeight != item.mFontWeight
+                       cacheItem.mFontStyle != item.mFontStyle.ToString() ||
+                       cacheItem.mFontWeight != item.mFontWeight.ToString()
                         )
                     {
                         isCanSave = true;
-                        var index = Settings.Default.PresetFontList.FindIndex(temp => temp.mTag == cacheItem.mTag);
+                        var index = Settings.Default.PreinstallFontList.FindIndex(temp => temp.mTag == cacheItem.mTag);
                         if (index != -1)
                         {
-                            Settings.Default.PresetFontList.Remove(cacheItem);
-                            Settings.Default.PresetFontList.Insert(index, item);
+                            Settings.Default.PreinstallFontList.Remove(cacheItem);
+
+                            var newItem1 = new PreinstallItem();
+                            newItem1.mTag = item.mTag;
+                            newItem1.mTagContent = item.mTagContent;
+                            newItem1.mFontStyle = item.mFontStyle.ToString();
+                            newItem1.mFontWeight = item.mFontWeight.ToString();
+                            newItem1.mFontSize = item.mFontSize;
+                            newItem1.mFontFamily = item.mFontFamily.Source;
+                            Settings.Default.PreinstallFontList.Insert(index, newItem1);
                         }
                         //cacheItem.mFontFamily = new FontFamily(item.mFontFamily.Source);
                         //cacheItem.mFontSize = item.mFontSize;
@@ -93,16 +150,16 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
                         break;
                     }
                 }
-                else
-                {
-                    TempLists.Add(item);
-                }
+                //else
+                //{
+                //    TempLists.Add(item);
+                //}
             }
 
-            foreach (var itemTemp in TempLists)
-            {
-                Settings.Default.PresetFontList.Add(itemTemp);
-            }
+            //foreach (var itemTemp in TempLists)
+            //{
+            //    Settings.Default.PresetFontList.Add(itemTemp);
+            //}
 
             if (isCanSave)
                 Settings.Default.Save();

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -590,6 +590,14 @@ View, Annotate and Convert PDFs with PDF Master to boost your productivity.</tar
           <target state="new">Start Now</target>
           <note from="MultilingualBuild" annotates="source" priority="2">已经登陆的情况下，最后一页按钮文案</note>
         </trans-unit>
+        <trans-unit id="GuidContent_Edit" translate="yes" xml:space="preserve">
+          <source>Fix a typo or add a new text box in a PDF effortlessly. Crop, replace, rotate, flip, and export images as desired.</source>
+          <target state="new">Fix a typo or add a new text box in a PDF effortlessly. Crop, replace, rotate, flip, and export images as desired.</target>
+        </trans-unit>
+        <trans-unit id="GuidTitle_Edit" translate="yes" xml:space="preserve">
+          <source>Edit Original Text and Images Like Word</source>
+          <target state="new">Edit Original Text and Images Like Word</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf

@@ -590,6 +590,14 @@ View, Annotate and Convert PDFs with PDF Master to boost your productivity.</tar
           <target state="new">Start Now</target>
           <note from="MultilingualBuild" annotates="source" priority="2">已经登陆的情况下，最后一页按钮文案</note>
         </trans-unit>
+        <trans-unit id="GuidContent_Edit" translate="yes" xml:space="preserve">
+          <source>Fix a typo or add a new text box in a PDF effortlessly. Crop, replace, rotate, flip, and export images as desired.</source>
+          <target state="new">Fix a typo or add a new text box in a PDF effortlessly. Crop, replace, rotate, flip, and export images as desired.</target>
+        </trans-unit>
+        <trans-unit id="GuidTitle_Edit" translate="yes" xml:space="preserve">
+          <source>Edit Original Text and Images Like Word</source>
+          <target state="new">Edit Original Text and Images Like Word</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf

@@ -590,6 +590,14 @@ View, Annotate and Convert PDFs with PDF Master to boost your productivity.</tar
           <target state="new">Start Now</target>
           <note from="MultilingualBuild" annotates="source" priority="2">已经登陆的情况下，最后一页按钮文案</note>
         </trans-unit>
+        <trans-unit id="GuidContent_Edit" translate="yes" xml:space="preserve">
+          <source>Fix a typo or add a new text box in a PDF effortlessly. Crop, replace, rotate, flip, and export images as desired.</source>
+          <target state="new">Fix a typo or add a new text box in a PDF effortlessly. Crop, replace, rotate, flip, and export images as desired.</target>
+        </trans-unit>
+        <trans-unit id="GuidTitle_Edit" translate="yes" xml:space="preserve">
+          <source>Edit Original Text and Images Like Word</source>
+          <target state="new">Edit Original Text and Images Like Word</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/PDF Master.csproj

@@ -2265,6 +2265,7 @@
     <Content Include="Resources\exe\SFTA.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Resource Include="Resources\GuidItems\Guid_Edit.png" />
     <Content Include="Resources\GuidPDF\Quick Start Guide.pdf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

PDF Office/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace PDF_Master.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -25,9 +25,9 @@ namespace PDF_Master.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public global::PDFSettings.Settings.RecentOpenFiles RecentOpenFiles {
+        public global::PDFSettings.RecentOpenFiles RecentOpenFiles {
             get {
-                return ((global::PDFSettings.Settings.RecentOpenFiles)(this["RecentOpenFiles"]));
+                return ((global::PDFSettings.RecentOpenFiles)(this["RecentOpenFiles"]));
             }
             set {
                 this["RecentOpenFiles"] = value;
@@ -305,5 +305,16 @@ namespace PDF_Master.Properties {
                 this["PDFEditList"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public global::PDFSettings.PreinstallFontList PreinstallFontList {
+            get {
+                return ((global::PDFSettings.PreinstallFontList)(this["PreinstallFontList"]));
+            }
+            set {
+                this["PreinstallFontList"] = value;
+            }
+        }
     }
 }

PDF Office/Properties/Settings.settings

@@ -2,7 +2,7 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="PDF_Master.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="RecentOpenFiles" Type="PDFSettings.Settings.RecentOpenFiles" Scope="User">
+    <Setting Name="RecentOpenFiles" Type="PDFSettings.RecentOpenFiles" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="DefautAnnotProperties" Type="PDFSettings.DefaultAnnotProperties" Scope="User">
@@ -74,6 +74,9 @@
     <Setting Name="IsNewInViewContent" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="PreinstallFontList" Type="PDFSettings.PreinstallFontList" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
     <Setting Name="PDFEditList" Type="PDFSettings.PDFEditList" Scope="User">
       <Value Profile="(Default)" />
     </Setting>

PDF Office/Settings.cs

@@ -56,6 +56,7 @@ namespace PDF_Master.Properties {
 
                 using (var fs = new FileStream(pathName, FileMode.Open, FileAccess.Read, FileShare.None))
                 {
+                    //判断是否可以成功打开并关闭，如果能够成功打开关闭，则表示没有被占用
                     fs.Close();
                 }
             }

PDF Office/Strings/HomePage/HomePage.Designer.cs

@@ -105,6 +105,15 @@ namespace PDF_Master.Strings.HomePage {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Fix a typo or add a new text box in a PDF effortlessly. Crop, replace, rotate, flip, and export images as desired. 的本地化字符串。
+        /// </summary>
+        public static string GuidContent_Edit {
+            get {
+                return ResourceManager.GetString("GuidContent_Edit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 PDF Master Beta Invites You to Enjoy All Advanced Features!
         ///
@@ -152,6 +161,15 @@ namespace PDF_Master.Strings.HomePage {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Edit Original Text and Images Like Word 的本地化字符串。
+        /// </summary>
+        public static string GuidTitle_Edit {
+            get {
+                return ResourceManager.GetString("GuidTitle_Edit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 The Brand New PDF Master 的本地化字符串。
         /// </summary>

PDF Office/Strings/HomePage/HomePage.resx

@@ -140,6 +140,9 @@ View, Annotate and Convert PDFs with PDF Master to boost your productivity.</val
   <data name="GuidContentP5" xml:space="preserve">
     <value>All advanced features in PDF Master can be used after registration, including converting PDFs without limitation.</value>
   </data>
+  <data name="GuidContent_Edit" xml:space="preserve">
+    <value>Fix a typo or add a new text box in a PDF effortlessly. Crop, replace, rotate, flip, and export images as desired.</value>
+  </data>
   <data name="GuidTitleP1" xml:space="preserve">
     <value>The Brand New PDF Master</value>
   </data>
@@ -155,6 +158,9 @@ View, Annotate and Convert PDFs with PDF Master to boost your productivity.</val
   <data name="GuidTitleP5" xml:space="preserve">
     <value>Sign up to Unlock Premium Features</value>
   </data>
+  <data name="GuidTitle_Edit" xml:space="preserve">
+    <value>Edit Original Text and Images Like Word</value>
+  </data>
   <data name="Guid_AcceptButton" xml:space="preserve">
     <value>Next</value>
   </data>

PDF Office/ViewModels/BottomToolContentViewModel.cs

@@ -19,7 +19,7 @@ using PDF_Master.ViewModels.BOTA;
 using PDF_Master.Views.BOTA;
 using PDF_Master.Views.PropertyPanel.AnnotPanel;
 using PDF_Master.Views.Tools;
-using PDFSettings.Settings;
+using PDFSettings;
 using PDF_Master.Helper;
 using System.IO;
 using ImTools;

PDF Office/ViewModels/Dialog/NoviceGuidDialogViewModel.cs

@@ -199,6 +199,7 @@ namespace PDF_Master.ViewModels.Dialog
             ItemSource = new ObservableCollection<GuidItemModel>();
             ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_Office.png", Title = App.HomePageLoader.GetString("GuidTitleP1"), Content = string.Format(App.HomePageLoader.GetString("GuidContentP1"),trialDays) }) ;
             ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_Annote.png", Title = App.HomePageLoader.GetString("GuidTitleP2"), Content =App.HomePageLoader.GetString("GuidContentP2") });
+            ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_Edit.png", Title = App.HomePageLoader.GetString("GuidTitle_Edit"), Content = App.HomePageLoader.GetString("GuidContent_Edit") });
             ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_Convert.png", Title = App.HomePageLoader.GetString("GuidTitleP3"), Content = App.HomePageLoader.GetString("GuidContentP3") });
             //因填写与签名功能暂时不上，隐藏新手引导宣传页
             //ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_FillAndSign.png", Title = App.HomePageLoader.GetString("GuidTitleP4"), Content = App.HomePageLoader.GetString("GuidContentP4") });

PDF Office/ViewModels/HomePanel/RecentFiles/RecentFilesContentViewModel.cs

@@ -3,7 +3,7 @@ using PDF_Master.CustomControl;
 using PDF_Master.Helper;
 using PDF_Master.Properties;
 using PDF_Master.Views;
-using PDFSettings.Settings;
+using PDFSettings;
 using Prism.Commands;
 using Prism.Mvvm;
 using System;

PDF Office/ViewModels/MainContentViewModel.cs

@@ -19,7 +19,7 @@ using System.Windows;
 using PDF_Master.Model;
 using System.ComponentModel;
 using PDF_Master.Helper;
-using PDFSettings.Settings;
+using PDFSettings;
 using System.Drawing;
 using System.IO;
 using System.Drawing.Imaging;

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -22,7 +22,7 @@ using PDF_Master.CustomControl;
 using Prism.Services.Dialogs;
 using PDF_Master.Properties;
 using PDF_Master.Helper;
-using PDFSettings.Settings;
+using PDFSettings;
 using PDF_Master.ViewModels.Dialog.ServiceDialog;
 
 namespace PDF_Master.ViewModels

PDF Office/ViewModels/PropertyPanel/AnnotPanel/FreetextAnnotPropertyViewModel.cs

@@ -683,7 +683,9 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                         FontVm.GetFontWeights_Style(currentItem.mFontStyle, currentItem.mFontWeight);
 
                         FontVm.CurrentPresetFont = new ComboDataItem(defaulItem.mTag, defaulItem.mTagContent);
-                        SelectedPresetFont();
+                        SelectedPresetFont();
+                        //更改后 保存到本地缓存
+                        TextFont.SavePresetFontList(FontVm.PresetFontList);
                     }
                 }
             }

PDF Office/ViewModels/PropertyPanel/ViewModular/SplitScreenContentViewModel.cs

@@ -3,7 +3,7 @@ using ComPDFKitViewer.PdfViewer;
 using Microsoft.Office.Interop.Excel;
 using PDF_Master.Helper;
 using PDF_Master.Model;
-using PDFSettings.Settings;
+using PDFSettings;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;

PDF Office/ViewModels/PropertyPanel/ViewModular/ThemesContentViewModel.cs

@@ -5,7 +5,7 @@ using PDF_Master.Helper;
 using PDF_Master.Model;
 using PDF_Master.Properties;
 using PDF_Master.Views.PropertyPanel.ViewModular;
-using PDFSettings.Settings;
+using PDFSettings;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;

PDF Office/ViewModels/PropertyPanel/ViewModular/ViewModularContentViewModel.cs

@@ -10,7 +10,7 @@ using PDF_Master.Model.BOTA;
 using PDF_Master.ViewModels.BOTA;
 using PDF_Master.Views;
 using PDF_Master.Views.BOTA;
-using PDFSettings.Settings;
+using PDFSettings;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Properties.cs

@@ -6,7 +6,7 @@ using PDF_Master.Helper;
 using PDF_Master.ViewModels.PropertyPanel.AnnotPanel;
 using PDF_Master.ViewModels.Tools.AnnotManager;
 using PDF_Master.Views.PropertyPanel.AnnotPanel;
-using PDFSettings.Settings;
+using PDFSettings;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Regions;

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -21,7 +21,7 @@ using PDF_Master.Views;
 using PDF_Master.Views.BOTA;
 using PDF_Master.Views.PropertyPanel.AnnotPanel;
 using PDFSettings;
-using PDFSettings.Settings;
+using PDFSettings;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -18,7 +18,7 @@ using Prism.Events;
 using PDF_Master.EventAggregators;
 using PDF_Master.Helper;
 using ComPDFKit.PDFDocument;
-using PDFSettings.Settings;
+using PDFSettings;
 using PDF_Master.Model.Dialog.ToolsDialogs.SaftyDialogs;
 using static PDF_Master.Model.Dialog.ToolsDialogs.SaftyDialogs.SetPasswordDialogModel;
 using PDF_Master.Model.Dialog.ToolsDialogs;

PDF Office/Views/HomePanel/RecentFiles/DocItemControl.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.IO;
-using PDFSettings.Settings;
+using PDFSettings;
 using PDF_Master.Helper;
 using ComPDFKit.PDFDocument;
 

PDF Office/Views/HomePanel/RecentFiles/DocItemListViewControl.xaml.cs

@@ -17,7 +17,7 @@ using System.Windows.Shapes;
 using ComPDFKit.PDFDocument;
 using ComPDFKitViewer.PdfViewer;
 using PDF_Master.Helper;
-using PDFSettings.Settings;
+using PDFSettings;
 
 namespace PDF_Master.Views.HomePanel.RecentFiles
 {

PDF Office/Views/HomePanel/RecentFiles/RecentFilesContent.xaml.cs

@@ -4,7 +4,7 @@ using PDF_Master.CustomControl;
 using PDF_Master.Helper;
 using PDF_Master.Properties;
 using PDF_Master.ViewModels.HomePanel.RecentFiles;
-using PDFSettings.Settings;
+using PDFSettings;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

PDF Office/Views/MainWindow.xaml.cs

@@ -21,7 +21,7 @@ using Prism.Ioc;
 using PDF_Master.Helper;
 using System.IO;
 using ComPDFKit.PDFDocument;
-using PDFSettings.Settings;
+using PDFSettings;
 using PDF_Master.Properties;
 using System.Windows.Interop;
 using System.Runtime.InteropServices;

PDF Office/Views/PropertyPanel/ViewModular/ThemesContent.xaml.cs

@@ -5,7 +5,7 @@ using PDF_Master.CustomControl;
 using PDF_Master.Helper;
 using PDF_Master.Properties;
 using PDF_Master.ViewModels.PropertyPanel.ViewModular;
-using PDFSettings.Settings;
+using PDFSettings;
 using System;
 using System.Collections.Generic;
 using System.Linq;

PDFSettings/PDFSettings.csproj

@@ -97,7 +97,6 @@
     <Compile Include="DialogCounter.cs" />
     <Compile Include="DpiHelpers.cs" />
     <Compile Include="BackgroundTemplateList.cs" />
-    <Compile Include="list.cs" />
     <Compile Include="PDFEditList.cs" />
     <Compile Include="PDFToolsList.cs" />
     <Compile Include="PresetFontList.cs" />

PDFSettings/PresetFontList.cs

@@ -10,7 +10,6 @@ namespace PDFSettings
 {
     public class PresetFontList : List<PresetFontItem>
     {
-
     }
 
     public class PresetFontItem
@@ -21,7 +20,19 @@ namespace PDFSettings
         public FontFamily mFontFamily { get; set; }
         public FontStyle mFontStyle { get; set; }
         public FontWeight mFontWeight { get; set; }
+    }
 
+    public class PreinstallFontList : List<PreinstallItem>
+    {
     }
 
-}
+    public class PreinstallItem
+    {
+        public string mTag { get; set; }
+        public string mTagContent { get; set; }
+        public int mFontSize { get; set; }
+        public string mFontFamily { get; set; }
+        public string mFontStyle { get; set; }
+        public string mFontWeight { get; set; }
+    }
+}

PDFSettings/RecentOpenFiles.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Media;
 
-namespace PDFSettings.Settings
+namespace PDFSettings
 {
     public class RecentOpenFiles : List<OpenFileInfo>
     {

PDFSettings/UserDate.cs

@@ -43,7 +43,7 @@ using System.Threading.Tasks;
         public string remark { get; set; }
         public string validFlag { get; set; }
 
-        public list<string> subscriptionInfoList { get; set; }
+        public List<string> subscriptionInfoList { get; set; }
         public string freeDate { get; set; } = "2023-06-01 08:00:00";
         public bool isInFreeUseTime { get; set; } = false;
     }

PDFSettings/list.cs

@@ -1,6 +0,0 @@
-namespace PDFSettings
-{
-    public class list<T>
-    {
-    }
-}