【综合】DMG版本比较表界面初步处理

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2619,6 +2619,12 @@
 		BB162E9B295073B40088E9D1 /* KMWatermarkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB162E9A295073B40088E9D1 /* KMWatermarkManager.swift */; };
 		BB162E9C295073B50088E9D1 /* KMWatermarkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB162E9A295073B40088E9D1 /* KMWatermarkManager.swift */; };
 		BB162E9D295073B50088E9D1 /* KMWatermarkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB162E9A295073B40088E9D1 /* KMWatermarkManager.swift */; };
+		BB183DD12B4EAD5400F99C7E /* Ubuntu-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB183DCF2B4EAD5300F99C7E /* Ubuntu-Medium.ttf */; };
+		BB183DD22B4EAD5400F99C7E /* Ubuntu-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB183DCF2B4EAD5300F99C7E /* Ubuntu-Medium.ttf */; };
+		BB183DD32B4EAD5400F99C7E /* Ubuntu-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB183DCF2B4EAD5300F99C7E /* Ubuntu-Medium.ttf */; };
+		BB183DD42B4EAD5400F99C7E /* Ubuntu-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB183DD02B4EAD5300F99C7E /* Ubuntu-Bold.ttf */; };
+		BB183DD52B4EAD5400F99C7E /* Ubuntu-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB183DD02B4EAD5300F99C7E /* Ubuntu-Bold.ttf */; };
+		BB183DD62B4EAD5400F99C7E /* Ubuntu-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB183DD02B4EAD5300F99C7E /* Ubuntu-Bold.ttf */; };
 		BB1969CD2B2833DA00922736 /* KMProgressWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1969CC2B2833DA00922736 /* KMProgressWindowController.swift */; };
 		BB1969CE2B2833DA00922736 /* KMProgressWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1969CC2B2833DA00922736 /* KMProgressWindowController.swift */; };
 		BB1969CF2B2833DA00922736 /* KMProgressWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1969CC2B2833DA00922736 /* KMProgressWindowController.swift */; };
@@ -5548,6 +5554,8 @@
 		BB162E91294FFE020088E9D1 /* KMWatermarkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMWatermarkModel.swift; sourceTree = "<group>"; };
 		BB162E96295062CD0088E9D1 /* KMPageRangeTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPageRangeTools.swift; sourceTree = "<group>"; };
 		BB162E9A295073B40088E9D1 /* KMWatermarkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMWatermarkManager.swift; sourceTree = "<group>"; };
+		BB183DCF2B4EAD5300F99C7E /* Ubuntu-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Ubuntu-Medium.ttf"; sourceTree = "<group>"; };
+		BB183DD02B4EAD5300F99C7E /* Ubuntu-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Ubuntu-Bold.ttf"; sourceTree = "<group>"; };
 		BB1969CC2B2833DA00922736 /* KMProgressWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMProgressWindowController.swift; sourceTree = "<group>"; };
 		BB1969D02B2833FE00922736 /* KMProgressWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMProgressWindowController.xib; sourceTree = "<group>"; };
 		BB1969D62B2842AD00922736 /* KMSnapshotWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSnapshotWindowController.swift; sourceTree = "<group>"; };
@@ -9048,6 +9056,8 @@
 				ADBC374429CAD2D300D93208 /* SF-Pro-Text-Bold.otf */,
 				ADEC7A7C299397F8009A8256 /* SF-Pro-Text-Regular.otf */,
 				ADEC7A7D299397F8009A8256 /* SF-Pro-Text-Semibold.otf */,
+				BB183DD02B4EAD5300F99C7E /* Ubuntu-Bold.ttf */,
+				BB183DCF2B4EAD5300F99C7E /* Ubuntu-Medium.ttf */,
 			);
 			path = Fonts;
 			sourceTree = "<group>";
@@ -12019,6 +12029,7 @@
 				BB5BE4F12B060EB500D51BF2 /* KMLanguageViewController.xib in Resources */,
 				899700E228F3A9F2009AF911 /* KMHomeWindowController.xib in Resources */,
 				BB6347C82AF24F6C00F5438E /* KMBatchoperateConvertCollectionViewItem.xib in Resources */,
+				BB183DD42B4EAD5400F99C7E /* Ubuntu-Bold.ttf in Resources */,
 				BB2F61532966A91D001CB369 /* KMBackgroundPropertyHomeController.xib in Resources */,
 				9FB220DA2B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib in Resources */,
 				89752DED293875FC003FF08E /* KMMainToolbarController.xib in Resources */,
@@ -12149,6 +12160,7 @@
 				ADD1B6F42946C07800C3FFF7 /* KMPrintChoosePageSizePosterView.xib in Resources */,
 				BB1BFF612AE9FA6C003EB179 /* KMBatchOperateBaseWindowController.xib in Resources */,
 				BBADCF582AF3C7B3004ECE0C /* KMBatchOperateAddWatermarkViewController.xib in Resources */,
+				BB183DD12B4EAD5400F99C7E /* Ubuntu-Medium.ttf in Resources */,
 				AD58F4122B1DAAB200299EE0 /* KMPrintDefaultView.xib in Resources */,
 				9F0201892A1DA28B00C9B673 /* KMAILanguagePopVC.xib in Resources */,
 				AD0FA50E29A9E75000EDEB50 /* KMLoginInputPasswordView.xib in Resources */,
@@ -12438,6 +12450,7 @@
 				ADE86AFC2B0AF5A400414DFA /* KMCompareContentSettingView.xib in Resources */,
 				BBFBE74A28DD7DDD008B2335 /* Main.storyboard in Resources */,
 				BB254D5B2B2A985A00C37B3B /* KMTTSWindowController.xib in Resources */,
+				BB183DD52B4EAD5400F99C7E /* Ubuntu-Bold.ttf in Resources */,
 				AD8810B629A846B100178CA1 /* KMVerficationCodeWindowController.xib in Resources */,
 				BB2EDF74296ECE17003BCF58 /* KMPageEditThumbnailItem.xib in Resources */,
 				BB897232294B08DE0045787C /* KMWatermarkViewController.xib in Resources */,
@@ -12598,6 +12611,7 @@
 				BB5F8A1A29BB15AD00365ADB /* pic_mail.pdf in Resources */,
 				BBA922162B4E783F0061057A /* KMPurchaseCompareDMGWindowController.xib in Resources */,
 				ADE787A62AA5A833002EC85A /* KMAccountExceptionWindowController.xib in Resources */,
+				BB183DD22B4EAD5400F99C7E /* Ubuntu-Medium.ttf in Resources */,
 				9F8539CF29430BF300DF644E /* KMBrowserWindowController.xib in Resources */,
 				ADE86AA12B031FDB00414DFA /* KMCompareWindowController.xib in Resources */,
 				BB4F7E7E2B0C45DE0077EC8C /* KMNoteOutlineFilterViewController.xib in Resources */,
@@ -12898,6 +12912,7 @@
 				9FA607E328FD4C9F00B46586 /* KMHomePopViewController.xib in Resources */,
 				F356720A29AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.xib in Resources */,
 				BB10FAF42AFE23BE00F18D65 /* LineInspector.xib in Resources */,
+				BB183DD62B4EAD5400F99C7E /* Ubuntu-Bold.ttf in Resources */,
 				BB7F7C0529AA586900A3E4E7 /* signAddBack.png in Resources */,
 				BB4BD9D12909026500A66A65 /* KMRightSideViewController.xib in Resources */,
 				9F0CB49429683DEE00007028 /* KMPropertiesPanelLineSubVC.xib in Resources */,
@@ -13028,6 +13043,7 @@
 				ADC31FAE2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */,
 				AD3AAD4B2B0B7B8900DE5FE7 /* KMCompareToolbar.xib in Resources */,
 				BBADCF5A2AF3C7B3004ECE0C /* KMBatchOperateAddWatermarkViewController.xib in Resources */,
+				BB183DD32B4EAD5400F99C7E /* Ubuntu-Medium.ttf in Resources */,
 				ADE3C1B029A4779E00793B13 /* KMPrintAccessoryController.xib in Resources */,
 				9FAAA32F290BD01D0046FFCE /* KMHomeHistoryFileViewController.xib in Resources */,
 				89D2D300294C806000BFF5FE /* KMPDFThumbnailItem.xib in Resources */,

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -371,7 +371,10 @@ import Cocoa
 extension KMBrowserWindowController: KMToolbarRightViewDelegate {
     func pdfRightSegmentedControlAction(_ sender: KMSegmentedBox?) {
         self.trackEvent_upgrade()
-        KMComparativeTableViewController.show(window: self.window!, .upgrade)
+//        KMComparativeTableViewController.show(window: self.window!, .upgrade)
+        DispatchQueue.main.async {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+        }
     }
     
     func userInfoButtonAction(_ sender: NSButton) {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/View/HyperLinkButton.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class HyperLinkButton: KMButton {
+@objcMembers class HyperLinkButton: KMButton {
 
     override func draw(_ dirtyRect: NSRect) {
         super.draw(dirtyRect)

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/View/KMButton.swift

@@ -8,7 +8,7 @@
 import Cocoa
 
 @objcMembers class KMButton: NSButton {
-    var mouseMoveCallback: ((Bool) -> Void)?
+   @objc var mouseMoveCallback: ((Bool) -> Void)?
 
     override func viewDidMoveToWindow() {
         super.viewDidMoveToWindow()

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -134,7 +134,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 @interface KMPurchaseCompareDMGWindowController ()
 
 @property (nonatomic, assign) IBOutlet NSTextField *titleLabel;
-@property (assign) IBOutlet HyperLinkButton *enterLicenseButton;
+@property (assign) IBOutlet KMButton *enterLicenseButton;
 
 @property (assign) IBOutlet NSView *freeContendView;
 
@@ -246,30 +246,30 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
     
     self.oneTimeTipLbl.stringValue = NSLocalizedString(@"one-time purchase", nil);
     self.enterLicenseButton.title = NSLocalizedString(@"Enter License", nil);
-//    [self.enterLicenseButton setTitleColor:[KMAppearance KMColor_Layout_W0]];
-//    self.enterLicenseButton.mouseMoveCallback = ^(BOOL mouseEntered) {
-//        if (mouseEntered) {
-//            [blockSelf.enterLicenseButton setTitleColor:[KMAppearance KMColor_Layout_W70]];
-//        } else {
-//            [blockSelf.enterLicenseButton setTitleColor:[KMAppearance KMColor_Layout_W0]];
-//        }
-//    };
+    [self.enterLicenseButton setTitleColor:[KMAppearance KMColor_Layout_W0]];
+    self.enterLicenseButton.mouseMoveCallback = ^(BOOL mouseEntered) {
+        if (mouseEntered) {
+            [blockSelf.enterLicenseButton setTitleColor:[KMAppearance KMColor_Layout_W70]];
+        } else {
+            [blockSelf.enterLicenseButton setTitleColor:[KMAppearance KMColor_Layout_W0]];
+        }
+    };
     
-//    self.titleLabel.font = [NSFont SFMediumFontWithSize:20];
-//    self.freeVersionLbl.font = [NSFont UbuntuBoldFontWithSize:24];
-//    self.parmanentVerLbl.font = [NSFont UbuntuBoldFontWithSize:24];
-//    self.freeVersionInfoLbl1.font =  self.parmanentVerInfoLbl1.font = [NSFont SFRegularFontWithSize:14.];
-//    self.freeVersionInfoLbl2.font = [NSFont SFRegularFontWithSize:14.];
-//    self.parmanentVerInfoLbl2.font = [NSFont SFRegularFontWithSize:14.];
-//    self.freeVersionInfoLbl3.font = self.parmanentVerInfoLbl3.font = [NSFont SFRegularFontWithSize:14.];
-//    self.freeVersionInfoLbl4.font = self.parmanentVerInfoLbl4.font = [NSFont SFRegularFontWithSize:14.];
-//    self.freeVersionInfoLbl5.font = self.parmanentVerInfoLbl5.font = [NSFont SFRegularFontWithSize:14.];
-//    self.freeVersionInfoLbl6.font = self.parmanentVerInfoLbl6.font = [NSFont SFRegularFontWithSize:14.];
-//    self.freeVersionInfoLbl7.font = self.parmanentVerInfoLbl7.font = [NSFont SFRegularFontWithSize:14.];
-//    self.freeVersionInfoLbl8.font = self.parmanentVerInfoLbl8.font = [NSFont SFRegularFontWithSize:14.];
-//    self.freeVersionInfoLbl9.font = self.parmanentVerInfoLbl9.font = [NSFont SFRegularFontWithSize:14.];
-//    self.buyNowButton.font = [NSFont UbuntuMediumFontWithSize:16];
-//    self.freeTrialButton.font = [NSFont UbuntuMediumFontWithSize:16];
+    self.titleLabel.font = [NSFont SFMediumFontWithSize:20];
+    self.freeVersionLbl.font = [NSFont UbuntuBoldFontWithSize:24];
+    self.parmanentVerLbl.font = [NSFont UbuntuBoldFontWithSize:24];
+    self.freeVersionInfoLbl1.font =  self.parmanentVerInfoLbl1.font = [NSFont SFProTextRegularFont:14.];
+    self.freeVersionInfoLbl2.font = [NSFont SFProTextRegularFont:14.];
+    self.parmanentVerInfoLbl2.font = [NSFont SFProTextRegularFont:14.];
+    self.freeVersionInfoLbl3.font = self.parmanentVerInfoLbl3.font = [NSFont SFProTextRegularFont:14.];
+    self.freeVersionInfoLbl4.font = self.parmanentVerInfoLbl4.font = [NSFont SFProTextRegularFont:14.];
+    self.freeVersionInfoLbl5.font = self.parmanentVerInfoLbl5.font = [NSFont SFProTextRegularFont:14.];
+    self.freeVersionInfoLbl6.font = self.parmanentVerInfoLbl6.font = [NSFont SFProTextRegularFont:14.];
+    self.freeVersionInfoLbl7.font = self.parmanentVerInfoLbl7.font = [NSFont SFProTextRegularFont:14.];
+    self.freeVersionInfoLbl8.font = self.parmanentVerInfoLbl8.font = [NSFont SFProTextRegularFont:14.];
+    self.freeVersionInfoLbl9.font = self.parmanentVerInfoLbl9.font = [NSFont SFProTextRegularFont:14.];
+    self.buyNowButton.font = [NSFont UbuntuMediumFontWithSize:16];
+    self.freeTrialButton.font = [NSFont UbuntuMediumFontWithSize:16];
     
     
     self.freeContendView.wantsLayer = YES;
@@ -322,9 +322,6 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
     
     [self updatePurchaseInformation];
     
-    // Google Analytics
-//    [[GAIManager shareManager] sendView:@"Desktop_TableIAP_gav3"];
-    
     [NSDistributedNotificationCenter.defaultCenter addObserver:self selector:@selector(themeChanged:) name:@"AppleInterfaceThemeChangedNotification" object: nil];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recommondInfoUpdateNoti:) name:@"KMRecommondInfoUpdateNoti" object:nil];
@@ -501,12 +498,12 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 
 - (IBAction)buttonItemClicked_Buy:(id)sender {
 #if VERSION_DMG
-    NSURL *url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/store?utm_source=app_dmg&utm_medium=dmg_puw_comparison"];
-    if([SKInspectPublicTool currentisLanguageHans]) {
-        url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_comparison"];
-    }
-    [[NSWorkspace sharedWorkspace] openURL:url];
-    [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
+//    NSURL *url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/store?utm_source=app_dmg&utm_medium=dmg_puw_comparison"];
+//    if([SKInspectPublicTool currentisLanguageHans]) {
+//        url = [NSURL URLWithString:@"https://www.pdfreaderpro.com/zh-cn/store?utm_source=app_dmg&utm_medium=dmg_puw_comparison"];
+//    }
+//    [[NSWorkspace sharedWorkspace] openURL:url];
+//    [[FMTrackEventManager manager] trackEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_UpgradeBuyNow"}];
 #endif
     
 }

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.xib

@@ -67,7 +67,7 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="dmg_upgrade_bg" id="9Tm-jc-Gvu"/>
                             </imageView>
-                            <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JrW-cc-ivk" customClass="HyperLinkButton">
+                            <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JrW-cc-ivk" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                 <rect key="frame" x="577" y="570" width="87" height="16"/>
                                 <buttonCell key="cell" type="bevel" title="Enter License" bezelStyle="rounded" alignment="left" controlSize="mini" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="5xA-GE-vQ7">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -334,7 +334,7 @@
                                                     <rect key="frame" x="1" y="1" width="160" height="38"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <button focusRingType="none" allowsExpansionToolTips="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4fI-f7-Qnp" customClass="KMButton">
+                                                        <button focusRingType="none" allowsExpansionToolTips="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4fI-f7-Qnp" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                             <rect key="frame" x="0.0" y="0.0" width="162" height="40"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <buttonCell key="cell" type="square" title="Free Trial" bezelStyle="shadowlessSquare" alignment="center" lineBreakMode="truncatingMiddle" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="OUe-aZ-jdt">
@@ -447,7 +447,7 @@
                                                 <rect key="frame" x="101" y="196" width="20" height="20"/>
                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_Tooltip" id="g1R-8J-uDu"/>
                                             </imageView>
-                                            <button translatesAutoresizingMaskIntoConstraints="NO" id="3mX-DM-Ssw" customClass="KMButton">
+                                            <button translatesAutoresizingMaskIntoConstraints="NO" id="3mX-DM-Ssw" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                 <rect key="frame" x="101" y="196" width="20" height="20"/>
                                                 <buttonCell key="cell" type="roundRect" bezelStyle="roundedRect" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="kWd-ga-hI9">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -651,7 +651,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="236" height="40"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HrV-Kb-x66" customClass="KMButton">
+                                                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HrV-Kb-x66" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="0.0" width="240" height="40"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <buttonCell key="cell" type="bevel" title="Buy Now" bezelStyle="rounded" imagePosition="overlaps" alignment="center" imageScaling="axesIndependently" inset="2" id="STh-CZ-uXs">
@@ -726,8 +726,8 @@
     </objects>
     <resources>
         <image name="compare_nosupport" width="16" height="16"/>
-        <image name="dmg_upgrade_bg" width="684" height="610"/>
-        <image name="dmg_upgrade_part_bg" width="300" height="466"/>
+        <image name="dmg_upgrade_bg" width="680" height="616"/>
+        <image name="dmg_upgrade_part_bg" width="300" height="494"/>
         <image name="function_vip" width="20" height="20"/>
         <image name="ic_Tooltip" width="16" height="16"/>
         <image name="salesDMG_icon" width="86" height="100"/>

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

@@ -234,17 +234,17 @@ import Cocoa
             self.btnBox.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
             self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
             self.activateTrialNowBtn.setTitleColor(NSColor(red: 7.0/255.0, green: 1.0/255.0, blue: 34.0/255.0, alpha: 1))
-            self.activateTrialNowBtn.mouseMoveCallback = { (mouseEntered) in
-                if mouseEntered {
-                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
-                    self.btnBox.fillColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1)
-                    self.btnBox.layer?.backgroundColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
-                } else {
-                    self.btnBox.fillColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1)
-                    self.btnBox.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
-                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
-                }
-            }
+//            self.activateTrialNowBtn.mouseMoveCallback = { (mouseEntered) in
+//                if mouseEntered {
+//                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
+//                    self.btnBox.fillColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1)
+//                    self.btnBox.layer?.backgroundColor = NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1).cgColor
+//                } else {
+//                    self.btnBox.fillColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1)
+//                    self.btnBox.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
+//                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1).cgColor
+//                }
+//            }
 //            self.activateTrialNowBtn.setBaseLineOffset(2)
             
             self.titleField.textColor =  NSColor(red: 0.0/255.0, green: 33.0/255.0, blue: 67.0/255.0, alpha: 1)
@@ -254,23 +254,23 @@ import Cocoa
             self.buyNowBtn.title = NSLocalizedString("Buy Now", comment: "")
             
             self.buyNowBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
-            self.buyNowBtn.mouseMoveCallback = { (mouseEntered) in
-                if mouseEntered {
-                    self.buyNowBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
-                } else {
-                    self.buyNowBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
-                }
-            }
+//            self.buyNowBtn.mouseMoveCallback = { (mouseEntered) in
+//                if mouseEntered {
+//                    self.buyNowBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
+//                } else {
+//                    self.buyNowBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
+//                }
+//            }
             
             self.enterLicenseBtn.title = NSLocalizedString("Enter License", comment: "")
             self.enterLicenseBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
-            self.enterLicenseBtn.mouseMoveCallback = { (mouseEntered) in
-                if mouseEntered {
-                    self.enterLicenseBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
-                } else {
-                    self.enterLicenseBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
-                }
-            }
+//            self.enterLicenseBtn.mouseMoveCallback = { (mouseEntered) in
+//                if mouseEntered {
+//                    self.enterLicenseBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
+//                } else {
+//                    self.enterLicenseBtn.setTitleColor(NSColor(red: 181.0/255.0, green: 177.0/255.0, blue: 239.0/255.0, alpha: 1))
+//                }
+//            }
             
             self.nameTextFieldView.layer?.backgroundColor = NSColor(red: 57.0/255.0, green: 58.0/255.0, blue: 70.0/255.0, alpha: 1).cgColor
             self.emailTextFieldView.layer?.backgroundColor = NSColor(red: 57.0/255.0, green: 58.0/255.0, blue: 70.0/255.0, alpha: 1).cgColor
@@ -309,40 +309,40 @@ import Cocoa
             self.btnBox.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
             self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
             self.activateTrialNowBtn.setTitleColor(NSColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1))
-            self.activateTrialNowBtn.mouseMoveCallback = { (mouseEntered) in
-                if mouseEntered {
-                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1).cgColor
-                    self.btnBox.fillColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1)
-                    self.btnBox.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1).cgColor
-                } else {
-                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
-                    self.btnBox.fillColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1)
-                    self.btnBox.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
-                }
-            }
+//            self.activateTrialNowBtn.mouseMoveCallback = { (mouseEntered) in
+//                if mouseEntered {
+//                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1).cgColor
+//                    self.btnBox.fillColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1)
+//                    self.btnBox.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 207.0/255.0, blue: 133.0/255.0, alpha: 1).cgColor
+//                } else {
+//                    self.activateTrialNowBtn.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
+//                    self.btnBox.fillColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1)
+//                    self.btnBox.layer?.backgroundColor = NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1).cgColor
+//                }
+//            }
             self.titleField.textColor =  NSColor(red: 0.0/255.0, green: 33.0/255.0, blue: 67.0/255.0, alpha: 1)
             
             self.trialTitleField.textColor = NSColor(red: 0.0/255.0, green: 33.0/255.0, blue: 67.0/255.0, alpha: 1)
             
             self.buyNowBtn.title = NSLocalizedString("Buy Now", comment: "")
             self.buyNowBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
-            self.buyNowBtn.mouseMoveCallback = { (mouseEntered) in
-                if mouseEntered {
-                    self.buyNowBtn.setTitleColor(NSColor(red: 8.0/255.0, green: 124.0/255.0, blue: 255.0/255.0, alpha: 1))
-                } else {
-                    self.buyNowBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
-                }
-            }
+//            self.buyNowBtn.mouseMoveCallback = { (mouseEntered) in
+//                if mouseEntered {
+//                    self.buyNowBtn.setTitleColor(NSColor(red: 8.0/255.0, green: 124.0/255.0, blue: 255.0/255.0, alpha: 1))
+//                } else {
+//                    self.buyNowBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
+//                }
+//            }
             
             self.enterLicenseBtn.title = NSLocalizedString("Enter License", comment: "")
             self.enterLicenseBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
-            self.enterLicenseBtn.mouseMoveCallback = { (mouseEntered) in
-                if mouseEntered {
-                    self.enterLicenseBtn.setTitleColor(NSColor(red: 8.0/255.0, green: 124.0/255.0, blue: 255.0/255.0, alpha: 1))
-                } else {
-                    self.enterLicenseBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
-                }
-            }
+//            self.enterLicenseBtn.mouseMoveCallback = { (mouseEntered) in
+//                if mouseEntered {
+//                    self.enterLicenseBtn.setTitleColor(NSColor(red: 8.0/255.0, green: 124.0/255.0, blue: 255.0/255.0, alpha: 1))
+//                } else {
+//                    self.enterLicenseBtn.setTitleColor(NSColor(red: 39.0/255.0, green: 60.0/255.0, blue: 98.0/255.0, alpha: 1))
+//                }
+//            }
             
             self.nameTextFieldView.layer?.backgroundColor = NSColor(red: 235.0/255.0, green: 236.0/255.0, blue: 250.0/255.0, alpha: 1).cgColor
             self.emailTextFieldView.layer?.backgroundColor = NSColor(red: 235.0/255.0, green: 236.0/255.0, blue: 250.0/255.0, alpha: 1).cgColor

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

@@ -92,31 +92,31 @@ class KMPurchaseLimitWindowController: NSWindowController {
         self.purchaseBtn.layer?.masksToBounds = true
         self.purchaseBtn.title = NSLocalizedString("Upgrade", comment: "")
         self.purchaseBtn.setTitleColor(NSColor.white)
-        self.purchaseBtn.mouseMoveCallback = { mouseEntered in
-            if mouseEntered {
-                self.purchaseBtn.layer?.backgroundColor = NSColor.black.withAlphaComponent(0.15).cgColor
-            } else {
-                self.purchaseBtn.layer?.backgroundColor = NSColor.clear.cgColor
-            }
-        }
+//        self.purchaseBtn.mouseMoveCallback = { mouseEntered in
+//            if mouseEntered {
+//                self.purchaseBtn.layer?.backgroundColor = NSColor.black.withAlphaComponent(0.15).cgColor
+//            } else {
+//                self.purchaseBtn.layer?.backgroundColor = NSColor.clear.cgColor
+//            }
+//        }
 //        self.purchaseBtn.setTitleFont(NSFont.ubuntuBoldFont(withSize: 16))
         
         self.convertButton.title = NSLocalizedString("Refresh Purchase Status", comment: "")
-        self.convertButton.mouseMoveCallback = { mouseEntered in
-            if mouseEntered {
-                if KMAppearance.isDarkMode() {
-                    self.convertButton.setTitleColor(NSColor.white)
-                } else {
-                    self.convertButton.setTitleColor(NSColor(red: 8/255.0, green: 124/255.0, blue: 255/255.0, alpha: 1))
-                }
-            } else {
-                if KMAppearance.isDarkMode() {
-                    self.convertButton.setTitleColor(NSColor(red: 181/255.0, green: 179/255.0, blue: 231/255.0, alpha: 1))
-                } else {
-                    self.convertButton.setTitleColor(NSColor(red: 0, green: 33/255.0, blue: 67/255.0, alpha: 1))
-                }
-            }
-        }
+//        self.convertButton.mouseMoveCallback = { mouseEntered in
+//            if mouseEntered {
+//                if KMAppearance.isDarkMode() {
+//                    self.convertButton.setTitleColor(NSColor.white)
+//                } else {
+//                    self.convertButton.setTitleColor(NSColor(red: 8/255.0, green: 124/255.0, blue: 255/255.0, alpha: 1))
+//                }
+//            } else {
+//                if KMAppearance.isDarkMode() {
+//                    self.convertButton.setTitleColor(NSColor(red: 181/255.0, green: 179/255.0, blue: 231/255.0, alpha: 1))
+//                } else {
+//                    self.convertButton.setTitleColor(NSColor(red: 0, green: 33/255.0, blue: 67/255.0, alpha: 1))
+//                }
+//            }
+//        }
         
         self.updateViewColor()
     }

PDF Office/PDF Master/PDF_Master DMG-Bridging-Header.h

@@ -77,3 +77,5 @@
 
 //文件权限
 #import "AppSandboxFileAccess.h"
+
+#import "KMPurchaseCompareWindowController.h"

PDF Office/PDF Master/PDF_Master Pro-Bridging-Header.h

@@ -61,3 +61,5 @@
 
 //文件权限
 #import "AppSandboxFileAccess.h"
+
+#import "KMPurchaseCompareWindowController.h"

PDF Office/PDF Master/PDF_Master-Bridging-Header.h

@@ -73,3 +73,5 @@
 
 //文件权限
 #import "AppSandboxFileAccess.h"
+
+#import "KMPurchaseCompareWindowController.h"

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

@@ -18,4 +18,16 @@ extension NSFont {
     @objc static func SFProTextBoldFont(_ size: CGFloat) -> NSFont {
         return NSFont(name: "SFProText-Bold", size: max(1, size)) ?? NSFont.systemFont(ofSize: max(1, size))
     }
+    
+    @objc static func SFMediumFontWithSize(_ size: CGFloat) -> NSFont {
+        return NSFont(name: "SFProText-Bold", size: max(1, size)) ?? NSFont.systemFont(ofSize: max(1, size))
+    }
+    
+    @objc static func UbuntuMediumFontWithSize(_ size: CGFloat) -> NSFont {
+        return NSFont(name: "Ubuntu-Medium", size: max(1, size)) ?? NSFont.systemFont(ofSize: max(1, size))
+    }
+    
+    @objc static func UbuntuBoldFontWithSize(_ size: CGFloat) -> NSFont {
+        return NSFont(name: "Ubuntu-Bold", size: max(1, size)) ?? NSFont.systemFont(ofSize: max(1, size))
+    }
 }