【综合】导入新字体文件

PDF Office/PDF Master/AppDelegate.swift

@@ -162,7 +162,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
         AIInfoManager.default()
         NotificationCenter.default.addObserver(self, selector: #selector(AIDeviceStatusChangeNotification), name: NSNotification.Name(rawValue: "kDeviceAIStatusChangeNotification"), object: nil)
         
-        for string in ["Ubuntu-Bold","Ubuntu-Medium"] {
+        for string in ["Ubuntu-Bold","Ubuntu-Medium","Ubuntu-Regular"] {
             let fontURL = Bundle.main.url(forResource: string, withExtension: "ttf")
             var error: Unmanaged<CFError>?
             if !CTFontManagerRegisterFontsForURL(fontURL! as CFURL, .process, &error) {

PDF Office/PDF Master/Class/Purchase/DMG/KMUpgradeWindowController.swift

@@ -76,13 +76,13 @@ class KMUpgradeWindowController: NSWindowController {
         self.enterlicenseBtn.font = NSFont.SFProTextRegularFont(14)
         
         self.advancedLabel.font = NSFont.UbuntuBoldFontWithSize(20)
-        self.advancedSubLabel1.font = NSFont.systemFont(ofSize: 14)
-        self.advancedSubLabel2.font = NSFont.systemFont(ofSize: 14)
-        self.advancedSubLabel3.font = NSFont.systemFont(ofSize: 14)
-        self.advancedSubLabel4.font = NSFont.systemFont(ofSize: 14)
-        self.advancedSubLabel5.font = NSFont.systemFont(ofSize: 14)
-        self.advancedSubLabel6.font = NSFont.systemFont(ofSize: 14)
-        self.advancedSubLabel7.font = NSFont.systemFont(ofSize: 14)
+        self.advancedSubLabel1.font = NSFont.UbuntuRegularFontWithSize(14)
+        self.advancedSubLabel2.font = NSFont.UbuntuRegularFontWithSize(14)
+        self.advancedSubLabel3.font = NSFont.UbuntuRegularFontWithSize(14)
+        self.advancedSubLabel4.font = NSFont.UbuntuRegularFontWithSize(14)
+        self.advancedSubLabel5.font = NSFont.UbuntuRegularFontWithSize(14)
+        self.advancedSubLabel6.font = NSFont.UbuntuRegularFontWithSize(14)
+        self.advancedSubLabel7.font = NSFont.UbuntuRegularFontWithSize(14)
         
         self.businessLabel.font = NSFont.UbuntuBoldFontWithSize(20)
         self.businessSubLabel1.font = NSFont.UbuntuMediumFontWithSize(14)

PDF Office/PDF Master/Info.plist

@@ -335,6 +335,7 @@
 		<string>SF-Pro-Text-Bold.otf</string>
 		<string>Ubuntu-Bold.ttf</string>
 		<string>Ubuntu-Medium.ttf</string>
+		<string>Ubuntu-Regular.ttf</string>
 	</array>
 	<key>NSServices</key>
 	<array>

PDF Office/PDF Master/Source/Fonts/NSFont+SFProText.swift

@@ -34,4 +34,8 @@ extension NSFont {
     @objc static func UbuntuBoldFontWithSize(_ size: CGFloat) -> NSFont {
         return NSFont(name: "Ubuntu-Bold", size: max(1, size)) ?? NSFont.systemFont(ofSize: max(1, size))
     }
+    
+    @objc static func UbuntuRegularFontWithSize(_ size: CGFloat) -> NSFont {
+        return NSFont(name: "Ubuntu-Regular", size: max(1, size)) ?? NSFont.systemFont(ofSize: max(1, size))
+    }
 }

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -3073,6 +3073,9 @@
 		BB1BFF922AEA6352003EB179 /* KMImageToPDFMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1BFF912AEA6352003EB179 /* KMImageToPDFMethod.swift */; };
 		BB1BFF932AEA6352003EB179 /* KMImageToPDFMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1BFF912AEA6352003EB179 /* KMImageToPDFMethod.swift */; };
 		BB1BFF942AEA6352003EB179 /* KMImageToPDFMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1BFF912AEA6352003EB179 /* KMImageToPDFMethod.swift */; };
+		BB1C28452C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB1C28442C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf */; };
+		BB1C28462C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB1C28442C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf */; };
+		BB1C28472C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB1C28442C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf */; };
 		BB1CA5C6298E20820059E31C /* KMPreferenceAligementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1CA5C5298E20820059E31C /* KMPreferenceAligementView.swift */; };
 		BB1CA5C7298E20820059E31C /* KMPreferenceAligementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1CA5C5298E20820059E31C /* KMPreferenceAligementView.swift */; };
 		BB1CA5C8298E20820059E31C /* KMPreferenceAligementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1CA5C5298E20820059E31C /* KMPreferenceAligementView.swift */; };
@@ -6740,6 +6743,7 @@
 		BB1BFF892AEA4725003EB179 /* KMTableHeaderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMTableHeaderCell.swift; sourceTree = "<group>"; };
 		BB1BFF8D2AEA547B003EB179 /* NSButton+CustomAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSButton+CustomAppearance.swift"; sourceTree = "<group>"; };
 		BB1BFF912AEA6352003EB179 /* KMImageToPDFMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMImageToPDFMethod.swift; sourceTree = "<group>"; };
+		BB1C28442C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Ubuntu-Regular.ttf"; sourceTree = "<group>"; };
 		BB1CA5C5298E20820059E31C /* KMPreferenceAligementView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPreferenceAligementView.swift; sourceTree = "<group>"; };
 		BB1CA5CA298E5F540059E31C /* KMMergeTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMMergeTools.swift; sourceTree = "<group>"; };
 		BB1D41D22B26D9BD00994EDC /* KMReusable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMReusable.swift; sourceTree = "<group>"; };
@@ -10808,6 +10812,7 @@
 				ADEC7A7D299397F8009A8256 /* SF-Pro-Text-Semibold.otf */,
 				BB183DD02B4EAD5300F99C7E /* Ubuntu-Bold.ttf */,
 				BB183DCF2B4EAD5300F99C7E /* Ubuntu-Medium.ttf */,
+				BB1C28442C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf */,
 			);
 			path = Fonts;
 			sourceTree = "<group>";
@@ -14794,6 +14799,7 @@
 				BB8252702C51E28D006D8904 /* KMRecommondPopWindow.xib in Resources */,
 				BB9F8F532C251ABF00A855B7 /* CSTextPropertyView.xib in Resources */,
 				ADC63E4B2A49BEDD00854E02 /* KMSubscribeWaterMarkCollectionItem.xib in Resources */,
+				BB1C28452C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf in Resources */,
 				AD7D5C952B8F20FE006562CD /* synctex_parser_version.txt in Resources */,
 				BBE66D092B55467C009343FA /* repeatTrialAlert_icon.png in Resources */,
 				BB82528F2C51EEBF006D8904 /* ad_cancel_button00.png in Resources */,
@@ -15042,6 +15048,7 @@
 				89E9B40A295D268E00AEFA61 /* KMEditImagePropertyViewController.xib in Resources */,
 				ADAFDA6D2AEB470200F084BC /* KMQucikToolsView.xib in Resources */,
 				BB89724A294C19980045787C /* KMWatermarkAdjectiveListController.xib in Resources */,
+				BB1C28462C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf in Resources */,
 				ADD272D529B9CFE20032B5D6 /* KMLightNoNetworkView.xib in Resources */,
 				9FD0FA2D29CD3ED400F2AB0D /* KMRightSideEmptyVC.xib in Resources */,
 				BBA8B7A72935CD740097D183 /* KMRemovePasswordAlertWindowController.xib in Resources */,
@@ -15951,6 +15958,7 @@
 				BB8252722C51E28D006D8904 /* KMRecommondPopWindow.xib in Resources */,
 				BB9F8F552C251ABF00A855B7 /* CSTextPropertyView.xib in Resources */,
 				9F8539DC294318D600DF644E /* TabsImage.xcassets in Resources */,
+				BB1C28472C5B9AE2005B4FA9 /* Ubuntu-Regular.ttf in Resources */,
 				BBE66D0B2B55467C009343FA /* repeatTrialAlert_icon.png in Resources */,
 				AD7D5C972B8F20FE006562CD /* synctex_parser_version.txt in Resources */,
 				BB8252912C51EEBF006D8904 /* ad_cancel_button00.png in Resources */,

PDF Office/PDF-Reader-Pro-DMG-Info.plist

@@ -446,6 +446,7 @@
 		<string>SF-Pro-Text-Bold.otf</string>
 		<string>Ubuntu-Bold.ttf</string>
 		<string>Ubuntu-Medium.ttf</string>
+		<string>Ubuntu-Regular.ttf</string>
 	</array>
 </dict>
 </plist>

PDF Office/PDF-Reader-Pro-Edition-Info.plist

@@ -321,6 +321,7 @@
 		<string>SF-Pro-Text-Bold.otf</string>
 		<string>Ubuntu-Medium.ttf</string>
 		<string>Ubuntu-Bold.ttf</string>
+		<string>Ubuntu-Regular.ttf</string>
 	</array>
 	<key>NSServices</key>
 	<array>