综合-合并develop分支(DMG处理相关)

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -200,8 +200,6 @@
 		8997012328F41AB8009AF911 /* KMLeftSideViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8997011E28F41AB8009AF911 /* KMLeftSideViewController.xib */; };
 		8997012428F41AB8009AF911 /* KMLeftSideViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8997011E28F41AB8009AF911 /* KMLeftSideViewController.xib */; };
 		899E0B092919244500B13D34 /* KMCustomTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899E0B082919244500B13D34 /* KMCustomTableRowView.swift */; };
-		899E0B0A2919244500B13D34 /* KMCustomTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899E0B082919244500B13D34 /* KMCustomTableRowView.swift */; };
-		899E0B0B2919244500B13D34 /* KMCustomTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899E0B082919244500B13D34 /* KMCustomTableRowView.swift */; };
 		89D2D2B62947316900BFF5FE /* Quick Start Guide_Widget_Widget.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 89D2D2B42947316800BFF5FE /* Quick Start Guide_Widget_Widget.pdf */; };
 		89D2D2B72947316900BFF5FE /* Quick Start Guide_Widget_Widget.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 89D2D2B42947316800BFF5FE /* Quick Start Guide_Widget_Widget.pdf */; };
 		89D2D2B82947316900BFF5FE /* Quick Start Guide_Widget_Widget.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 89D2D2B42947316800BFF5FE /* Quick Start Guide_Widget_Widget.pdf */; };
@@ -392,13 +390,12 @@
 		89E9B3FB295BE2EC00AEFA61 /* KMEditPDFTextPropertyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E9B3F8295BE2EC00AEFA61 /* KMEditPDFTextPropertyViewController.xib */; };
 		89E9B406295D268E00AEFA61 /* KMEditImagePropertyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E9B404295D268E00AEFA61 /* KMEditImagePropertyViewController.swift */; };
 		89E9B407295D268E00AEFA61 /* KMEditImagePropertyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E9B404295D268E00AEFA61 /* KMEditImagePropertyViewController.swift */; };
-		89E9B408295D268E00AEFA61 /* KMEditImagePropertyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E9B404295D268E00AEFA61 /* KMEditImagePropertyViewController.swift */; };
 		89E9B409295D268E00AEFA61 /* KMEditImagePropertyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E9B405295D268E00AEFA61 /* KMEditImagePropertyViewController.xib */; };
 		89E9B40A295D268E00AEFA61 /* KMEditImagePropertyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E9B405295D268E00AEFA61 /* KMEditImagePropertyViewController.xib */; };
 		89E9B40B295D268E00AEFA61 /* KMEditImagePropertyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E9B405295D268E00AEFA61 /* KMEditImagePropertyViewController.xib */; };
 		9F080B0F298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9F080B10298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; };
-		9F080B11298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; };
+		9F080B11298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9F080B14298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B12298CFDB300FC27DA /* KMTextImageButtonVC.swift */; };
 		9F080B15298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B12298CFDB300FC27DA /* KMTextImageButtonVC.swift */; };
 		9F080B16298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B12298CFDB300FC27DA /* KMTextImageButtonVC.swift */; };
@@ -626,7 +623,6 @@
 		9F1FE3E0293EE51F00E952CA /* KMMainDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F1FE3DD293EE51F00E952CA /* KMMainDocument.swift */; };
 		9F1FE3F4293F4F0F00E952CA /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9F1FE3F3293F4F0F00E952CA /* Info.plist */; };
 		9F1FE3F5293F4F0F00E952CA /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9F1FE3F3293F4F0F00E952CA /* Info.plist */; };
-		9F1FE3F6293F4F0F00E952CA /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9F1FE3F3293F4F0F00E952CA /* Info.plist */; };
 		9F1FE49329406E4700E952CA /* common.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F1FE43629406E4700E952CA /* common.m */; };
 		9F1FE49429406E4700E952CA /* common.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F1FE43629406E4700E952CA /* common.m */; };
 		9F1FE49529406E4700E952CA /* common.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F1FE43629406E4700E952CA /* common.m */; };
@@ -1317,9 +1313,7 @@
 		AD9527EF295578BD0039D2BC /* KMBaseTextFieldPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD9527ED295578BD0039D2BC /* KMBaseTextFieldPresenter.swift */; };
 		AD9527F0295578BD0039D2BC /* KMBaseTextFieldPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD9527ED295578BD0039D2BC /* KMBaseTextFieldPresenter.swift */; };
 		ADA08A7E29F13EA0009B2A7B /* ComPDFKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A7C29F13EA0009B2A7B /* ComPDFKit.framework */; };
-		ADA08A7F29F13EA0009B2A7B /* ComPDFKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A7C29F13EA0009B2A7B /* ComPDFKit.framework */; };
 		ADA08A8229F13EE1009B2A7B /* ComPDFKit_Conversion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A8029F13EE1009B2A7B /* ComPDFKit_Conversion.framework */; };
-		ADA08A8329F13EE1009B2A7B /* ComPDFKit_Conversion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A8029F13EE1009B2A7B /* ComPDFKit_Conversion.framework */; };
 		ADA08A8429F1430E009B2A7B /* ComPDFKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A7C29F13EA0009B2A7B /* ComPDFKit.framework */; };
 		ADA08A8529F1430E009B2A7B /* ComPDFKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A7C29F13EA0009B2A7B /* ComPDFKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		ADA08A8629F14336009B2A7B /* ComPDFKit_Conversion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A8029F13EE1009B2A7B /* ComPDFKit_Conversion.framework */; };
@@ -1745,11 +1739,9 @@
 		ADE3C1C529A4C13700793B13 /* KMPrintAccessoryController_OC.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADE3C1C029A4C13700793B13 /* KMPrintAccessoryController_OC.xib */; };
 		ADE3C1C629A4C13700793B13 /* KMPrintAccessoryController_OC.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADE3C1C029A4C13700793B13 /* KMPrintAccessoryController_OC.xib */; };
 		ADE3C1C929A5A75E00793B13 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1C729A5A75E00793B13 /* AFNetworking.framework */; };
-		ADE3C1CA29A5A75E00793B13 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1C729A5A75E00793B13 /* AFNetworking.framework */; };
 		ADE3C1CC29A5A7EE00793B13 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1C729A5A75E00793B13 /* AFNetworking.framework */; };
 		ADE3C1CD29A5A7EE00793B13 /* AFNetworking.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1C729A5A75E00793B13 /* AFNetworking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		ADE3C1D329A5A91600793B13 /* KMAdvertisement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1D129A5A91600793B13 /* KMAdvertisement.framework */; };
-		ADE3C1D429A5A91600793B13 /* KMAdvertisement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1D129A5A91600793B13 /* KMAdvertisement.framework */; };
 		ADE3C1D529A5A91C00793B13 /* KMAdvertisement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1D129A5A91600793B13 /* KMAdvertisement.framework */; };
 		ADE3C1D629A5A91C00793B13 /* KMAdvertisement.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1D129A5A91600793B13 /* KMAdvertisement.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		ADE3C1DE29A5AA0B00793B13 /* KMRequestServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE3C1DD29A5AA0B00793B13 /* KMRequestServer.swift */; };
@@ -2169,6 +2161,7 @@
 		BB3AD6F929935483004FC1AE /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = BB3AD6F729935483004FC1AE /* Reachability.m */; };
 		BB3AD6FA29935483004FC1AE /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = BB3AD6F729935483004FC1AE /* Reachability.m */; };
 		BB3AD6FB29935483004FC1AE /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = BB3AD6F729935483004FC1AE /* Reachability.m */; };
+		BB3BA9082A13684A00623C08 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BBFBE6C128DD7B98008B2335 /* Assets.xcassets */; };
 		BB3EAEAD293E3D6000D92407 /* KMConvertBaseWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3EAEAB293E3D6000D92407 /* KMConvertBaseWindowController.swift */; };
 		BB3EAEAE293E3D6000D92407 /* KMConvertBaseWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3EAEAB293E3D6000D92407 /* KMConvertBaseWindowController.swift */; };
 		BB3EAEAF293E3D6000D92407 /* KMConvertBaseWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3EAEAB293E3D6000D92407 /* KMConvertBaseWindowController.swift */; };
@@ -2418,6 +2411,8 @@
 		BB86C21E28F561F8005AD968 /* SKRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = BB86C21C28F561F8005AD968 /* SKRuntime.m */; };
 		BB86C21F28F561F8005AD968 /* SKRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = BB86C21C28F561F8005AD968 /* SKRuntime.m */; };
 		BB86C22028F561F8005AD968 /* SKRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = BB86C21C28F561F8005AD968 /* SKRuntime.m */; };
+		BB88401E2A132C6B0062446B /* ObjectiveDropboxOfficial.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; };
+		BB88401F2A132C6B0062446B /* ObjectiveDropboxOfficial.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BB88E43B294023CB002B3655 /* KMDocumentModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB88E43A294023CB002B3655 /* KMDocumentModel.swift */; };
 		BB88E43C294023CB002B3655 /* KMDocumentModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB88E43A294023CB002B3655 /* KMDocumentModel.swift */; };
 		BB88E43D294023CB002B3655 /* KMDocumentModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB88E43A294023CB002B3655 /* KMDocumentModel.swift */; };
@@ -2634,6 +2629,7 @@
 		BB9DCC9F2A0A2B0A0024A6F1 /* KMConvertSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB9DCC9E2A0A2B0A0024A6F1 /* KMConvertSettingView.swift */; };
 		BB9DCCA02A0A2B0A0024A6F1 /* KMConvertSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB9DCC9E2A0A2B0A0024A6F1 /* KMConvertSettingView.swift */; };
 		BB9DCCA12A0A2B0A0024A6F1 /* KMConvertSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB9DCC9E2A0A2B0A0024A6F1 /* KMConvertSettingView.swift */; };
+		BB9DEE862A14A01D00351CC4 /* PDF-Master-DMG-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = ADC076122987F06A006C752F /* PDF-Master-DMG-Info.plist */; };
 		BBA19F3229ADAC81001A285A /* signPicture_hover.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BBA19F3129ADAC81001A285A /* signPicture_hover.pdf */; };
 		BBA19F3329ADAC81001A285A /* signPicture_hover.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BBA19F3129ADAC81001A285A /* signPicture_hover.pdf */; };
 		BBA19F3429ADAC81001A285A /* signPicture_hover.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BBA19F3129ADAC81001A285A /* signPicture_hover.pdf */; };
@@ -2785,11 +2781,8 @@
 		BBB9B32F299A5D6D004F3235 /* GTMAppAuthFetcherAuthorization.m in Sources */ = {isa = PBXBuildFile; fileRef = BBB9B306299A5D6C004F3235 /* GTMAppAuthFetcherAuthorization.m */; };
 		BBB9B330299A5D6D004F3235 /* GTMAppAuthFetcherAuthorization.m in Sources */ = {isa = PBXBuildFile; fileRef = BBB9B306299A5D6C004F3235 /* GTMAppAuthFetcherAuthorization.m */; };
 		BBB9B337299A5F35004F3235 /* ObjectiveDropboxOfficial.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; };
-		BBB9B338299A5F35004F3235 /* ObjectiveDropboxOfficial.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; };
 		BBB9B339299A5FD1004F3235 /* ObjectiveDropboxOfficial.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; };
 		BBB9B33A299A5FD1004F3235 /* ObjectiveDropboxOfficial.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		BBBC5E7A29936DB3006DC966 /* ObjectiveDropboxOfficial.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BB3AD6DE29935171004FC1AE /* ObjectiveDropboxOfficial.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		BBBC5E8029936DC1006DC966 /* ObjectiveDropboxOfficial.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BB3AD6DE29935171004FC1AE /* ObjectiveDropboxOfficial.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BBC2BCC6295DA8F30036B983 /* KMCropPreviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC2BCC4295DA8F30036B983 /* KMCropPreviewController.swift */; };
 		BBC2BCC7295DA8F30036B983 /* KMCropPreviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC2BCC4295DA8F30036B983 /* KMCropPreviewController.swift */; };
 		BBC2BCC8295DA8F30036B983 /* KMCropPreviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC2BCC4295DA8F30036B983 /* KMCropPreviewController.swift */; };
@@ -2901,6 +2894,21 @@
 		BBD1F79C296FF7A600343885 /* KMPageEditSplitSettingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD1F79B296FF7A600343885 /* KMPageEditSplitSettingModel.swift */; };
 		BBD1F79D296FF7A600343885 /* KMPageEditSplitSettingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD1F79B296FF7A600343885 /* KMPageEditSplitSettingModel.swift */; };
 		BBD1F79E296FF7A600343885 /* KMPageEditSplitSettingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD1F79B296FF7A600343885 /* KMPageEditSplitSettingModel.swift */; };
+		BBD7FDFB2A13210700F96075 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1C729A5A75E00793B13 /* AFNetworking.framework */; };
+		BBD7FDFC2A13210700F96075 /* AFNetworking.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1C729A5A75E00793B13 /* AFNetworking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BBD7FDFD2A13210A00F96075 /* ComPDFKit_Conversion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A8029F13EE1009B2A7B /* ComPDFKit_Conversion.framework */; };
+		BBD7FDFE2A13210A00F96075 /* ComPDFKit_Conversion.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A8029F13EE1009B2A7B /* ComPDFKit_Conversion.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BBD7FDFF2A13210C00F96075 /* ComPDFKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A7C29F13EA0009B2A7B /* ComPDFKit.framework */; };
+		BBD7FE002A13210C00F96075 /* ComPDFKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A7C29F13EA0009B2A7B /* ComPDFKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BBD7FE012A13211700F96075 /* KMAdvertisement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1D129A5A91600793B13 /* KMAdvertisement.framework */; };
+		BBD7FE022A13211700F96075 /* KMAdvertisement.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADE3C1D129A5A91600793B13 /* KMAdvertisement.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BBD7FE032A13218E00F96075 /* KMWatermarkAdjectivePropertyBaseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB897234294B38DC0045787C /* KMWatermarkAdjectivePropertyBaseController.swift */; };
+		BBD7FE042A13218F00F96075 /* KMWatermarkAdjectivePropertyBaseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB897234294B38DC0045787C /* KMWatermarkAdjectivePropertyBaseController.swift */; };
+		BBD7FE052A1323A400F96075 /* KMEditImagePropertyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E9B404295D268E00AEFA61 /* KMEditImagePropertyViewController.swift */; };
+		BBD7FE062A1323F000F96075 /* KMCustomTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899E0B082919244500B13D34 /* KMCustomTableRowView.swift */; };
+		BBD7FE072A1323F500F96075 /* KMCustomTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899E0B082919244500B13D34 /* KMCustomTableRowView.swift */; };
+		BBD7FE082A13241C00F96075 /* KMOutlineEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89DB5DA7291B8DE70029624F /* KMOutlineEditViewController.swift */; };
+		BBD7FE092A13241E00F96075 /* KMOutlineEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89DB5DA7291B8DE70029624F /* KMOutlineEditViewController.swift */; };
 		BBDEFDD729A8AB0700A90A82 /* PDFPage_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = BBDEFDD529A8AB0600A90A82 /* PDFPage_SKExtensions.m */; };
 		BBDEFDD829A8AB0700A90A82 /* PDFPage_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = BBDEFDD529A8AB0600A90A82 /* PDFPage_SKExtensions.m */; };
 		BBDEFDD929A8AB0700A90A82 /* PDFPage_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = BBDEFDD529A8AB0600A90A82 /* PDFPage_SKExtensions.m */; };
@@ -3318,7 +3326,6 @@
 			dstSubfolderSpec = 10;
 			files = (
 				89752DAA2936ECE9003FF08E /* Masonry.framework in Embed Frameworks */,
-				BBBC5E7A29936DB3006DC966 /* ObjectiveDropboxOfficial.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3329,8 +3336,12 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				BBD7FE022A13211700F96075 /* KMAdvertisement.framework in Embed Frameworks */,
+				BBD7FDFE2A13210A00F96075 /* ComPDFKit_Conversion.framework in Embed Frameworks */,
 				89752DA82936ECE4003FF08E /* Masonry.framework in Embed Frameworks */,
-				BBBC5E8029936DC1006DC966 /* ObjectiveDropboxOfficial.framework in Embed Frameworks */,
+				BBD7FDFC2A13210700F96075 /* AFNetworking.framework in Embed Frameworks */,
+				BB88401F2A132C6B0062446B /* ObjectiveDropboxOfficial.framework in Embed Frameworks */,
+				BBD7FE002A13210C00F96075 /* ComPDFKit.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4246,7 +4257,6 @@
 		BB3AAB8F29878CE000992A5A /* KMWatermarkAdjectivePropertyMainController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMWatermarkAdjectivePropertyMainController.xib; sourceTree = "<group>"; };
 		BB3AAB972987BEA900992A5A /* KMWatermarkPDFView_OC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMWatermarkPDFView_OC.m; sourceTree = "<group>"; };
 		BB3AAB982987BEA900992A5A /* KMWatermarkPDFView_OC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMWatermarkPDFView_OC.h; sourceTree = "<group>"; };
-		BB3AD6DE29935171004FC1AE /* ObjectiveDropboxOfficial.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ObjectiveDropboxOfficial.framework; sourceTree = "<group>"; };
 		BB3AD6F729935483004FC1AE /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
 		BB3AD6F829935483004FC1AE /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
 		BB3EAEAB293E3D6000D92407 /* KMConvertBaseWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMConvertBaseWindowController.swift; sourceTree = "<group>"; };
@@ -4590,7 +4600,6 @@
 		BBFBE71F28DD7C43008B2335 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		BBFBE72128DD7C43008B2335 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		BBFBE72428DD7C43008B2335 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		BBFBE72628DD7C43008B2335 /* PDF_ Master_DMG.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "PDF_ Master_DMG.entitlements"; sourceTree = "<group>"; };
 		BBFBE72B28DD7C43008B2335 /* PDF Master DMGTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "PDF Master DMGTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BBFBE72F28DD7C43008B2335 /* PDF_ Master_DMGTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PDF_ Master_DMGTests.swift"; sourceTree = "<group>"; };
 		BBFBE73528DD7C43008B2335 /* PDF Master DMGUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "PDF Master DMGUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -4812,13 +4821,17 @@
 				BBB9B338299A5F35004F3235 /* ObjectiveDropboxOfficial.framework in Frameworks */,
 				ADE3C1D429A5A91600793B13 /* KMAdvertisement.framework in Frameworks */,
 				BB9DCC9B2A0A10410024A6F1 /* ComDocumentAIKit.framework in Frameworks */,
+				BBD7FDFB2A13210700F96075 /* AFNetworking.framework in Frameworks */,
 				89D9896528FD23BF003A3E87 /* PDFKit.framework in Frameworks */,
-				ADA08A7F29F13EA0009B2A7B /* ComPDFKit.framework in Frameworks */,
 				89752DA72936ECE4003FF08E /* Masonry.framework in Frameworks */,
 				BB9DCC882A09FC760024A6F1 /* libDocumentAI.dylib in Frameworks */,
 				BB9DCC852A09FC760024A6F1 /* libopencv_world.4.2.0.dylib in Frameworks */,
 				BB9DCC8E2A09FC770024A6F1 /* libpaddle2onnx.1.0.5.dylib in Frameworks */,
 				ADA08A8329F13EE1009B2A7B /* ComPDFKit_Conversion.framework in Frameworks */,
+				BBD7FDFF2A13210C00F96075 /* ComPDFKit.framework in Frameworks */,
+				BB88401E2A132C6B0062446B /* ObjectiveDropboxOfficial.framework in Frameworks */,
+				BBD7FDFD2A13210A00F96075 /* ComPDFKit_Conversion.framework in Frameworks */,
+				BBD7FE012A13211700F96075 /* KMAdvertisement.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5555,7 +5568,6 @@
 		9F5664842987EBE500020985 /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
-				BB3AD6DE29935171004FC1AE /* ObjectiveDropboxOfficial.framework */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
@@ -8650,7 +8662,6 @@
 				BBFBE71F28DD7C43008B2335 /* ViewController.swift */,
 				BBFBE72128DD7C43008B2335 /* Assets.xcassets */,
 				BBFBE72328DD7C43008B2335 /* Main.storyboard */,
-				BBFBE72628DD7C43008B2335 /* PDF_ Master_DMG.entitlements */,
 			);
 			path = "PDF Master DMG";
 			sourceTree = "<group>";
@@ -9790,7 +9801,6 @@
 				BBEC00D6295C33D600A26C98 /* KMCreateBatesController.xib in Resources */,
 				9F1F82E82934D5240092C4B4 /* KMHomeExtractActionViewController.xib in Resources */,
 				F3B7DF9F2948565000333201 /* CPDFListHoverAnnotationViewController.xib in Resources */,
-				9F1FE3F6293F4F0F00E952CA /* Info.plist in Resources */,
 				BB69C961299116FD0001A9B1 /* plaid.pdf in Resources */,
 				9F0CB4AC296CF19600007028 /* KMPropertiesPanelListMenuSubVC.xib in Resources */,
 				ADB2D6FF294882B70029D2B3 /* KMTextFieldStepperView.xib in Resources */,
@@ -9829,6 +9839,7 @@
 				9FF94F1629A7476000B1EF69 /* KMDesignPropertySelector.xib in Resources */,
 				ADE8BC3529F9261900570F89 /* KMSearchCellView.xib in Resources */,
 				ADC075DF29876622006C752F /* KMBatchConverPDFPPTView.xib in Resources */,
+				BB3BA9082A13684A00623C08 /* Assets.xcassets in Resources */,
 				AD0FA51829A9FA8F00EDEB50 /* KMResetPasswordView.xib in Resources */,
 				ADE3C1E929A5ABC200793B13 /* KMLoginWindowController.xib in Resources */,
 				ADC075C629866B05006C752F /* KMBatchTextRecognitionView.xib in Resources */,
@@ -9874,6 +9885,7 @@
 				BBA8B7B5293635D80097D183 /* KMPasswordInputWindow.xib in Resources */,
 				F359917D292B7B8A000D25DE /* InitialUserDefaults.plist in Resources */,
 				89752DB22936F505003FF08E /* KMCustomButtonPopMenuViewController.xib in Resources */,
+				BB9DEE862A14A01D00351CC4 /* PDF-Master-DMG-Info.plist in Resources */,
 				BB8F455C295AA1270037EA22 /* KMHeaderFooterPropertyInfoController.xib in Resources */,
 				9FD0FA5029D43D6800F2AB0D /* KMDeviceBrowserWindowController.xib in Resources */,
 				AD68783A29A60FC0005B5210 /* KMLoginView.xib in Resources */,
@@ -11453,6 +11465,7 @@
 				BB16473A29E7A4C30044DFBE /* NSTextView+KMExtension.m in Sources */,
 				AD9527BB295291F20039D2BC /* KMPrintPage.swift in Sources */,
 				ADE3C1AC29A4779E00793B13 /* KMPrintAccessoryController.swift in Sources */,
+				BBD7FE082A13241C00F96075 /* KMOutlineEditViewController.swift in Sources */,
 				ADB1FE6F29752BB700ED072D /* KMBatchConvertPDFView.swift in Sources */,
 				BB8F4558295AA1270037EA22 /* KMHeaderFooterPropertyInfoController.swift in Sources */,
 				BB7F7BF829AA469F00A3E4E7 /* KMSigntureViewItem.m in Sources */,
@@ -11475,6 +11488,7 @@
 				BBAFC83D2985194800D0648E /* KMPDFEditAppendWindow.m in Sources */,
 				89E4E6F62963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.m in Sources */,
 				F359916A29261F0E000D25DE /* CPDFListView+Tool.m in Sources */,
+				BBD7FE072A1323F500F96075 /* KMCustomTableRowView.swift in Sources */,
 				9F1FE4F729406E4700E952CA /* CTFloatingBarBackingView.m in Sources */,
 				BB9695B329BDA46500FD68D3 /* SKLocalization.m in Sources */,
 				9F0CB4EE298655A800007028 /* KMDesignToken+PaddingLeft.swift in Sources */,
@@ -11583,6 +11597,7 @@
 				ADCB98E22924776F00B51A03 /* KMBatchProcessingSizeTableCell.swift in Sources */,
 				89E4E76A29656B35002DBA6F /* KMButton.m in Sources */,
 				8942F80F29277BAF00389627 /* NSMenu+Category.m in Sources */,
+				BBD7FE032A13218E00F96075 /* KMWatermarkAdjectivePropertyBaseController.swift in Sources */,
 				BB2EDF4D296E63E5003BCF58 /* KMPageEditInsertCustomPageWindowController.swift in Sources */,
 				9F0CB522298656AA00007028 /* KMDesignToken+BorderRadiusBottomLeft.swift in Sources */,
 				BBE0BDF429A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */,
@@ -11601,7 +11616,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				BBFBE70128DD7C21008B2335 /* PDF_ Master_ProTests.swift in Sources */,
-				899E0B0A2919244500B13D34 /* KMCustomTableRowView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -11765,6 +11779,7 @@
 				BBB9B324299A5D6D004F3235 /* KMServicesCloudFile.m in Sources */,
 				BB003037298D356E002DD1A0 /* KMPreferenceMarkupColorView.swift in Sources */,
 				ADB1FE9029752F7000ED072D /* KMBatchBackgroundView.swift in Sources */,
+				BBD7FE062A1323F000F96075 /* KMCustomTableRowView.swift in Sources */,
 				F3732310292DF9410013862C /* CPDFInkAnnotation+PDFListView.m in Sources */,
 				9F0CB4C6298625F400007028 /* NSColor+KMExtensions.swift in Sources */,
 				BBC745F4295F0DD00072C2ED /* KMCropSettingPageSizeView.swift in Sources */,
@@ -11858,6 +11873,7 @@
 				BBD1F789296FAC7C00343885 /* KMPageEditSettingBaseView.swift in Sources */,
 				BB2C6ACF28F41BA000478A33 /* CPDFListView.m in Sources */,
 				BB2EDF6C296ECE17003BCF58 /* KMPageEditInsertTypeItemView.swift in Sources */,
+				BBD7FE052A1323A400F96075 /* KMEditImagePropertyViewController.swift in Sources */,
 				9F1FE4D729406E4700E952CA /* NSPasteboard+Utils.m in Sources */,
 				BBB9B30F299A5D6D004F3235 /* KMCloudUploadOperationQueue.m in Sources */,
 				BB14700D299DC0D100784A6A /* OIDAuthorizationRequest.m in Sources */,
@@ -11910,6 +11926,7 @@
 				89E4E7842967BF5A002DBA6F /* KMCustomizeStampViewController.m in Sources */,
 				ADB1FE8029752F2900ED072D /* KMBatchSecurityView.swift in Sources */,
 				BB146FFB299DC0D100784A6A /* OIDExternalUserAgentMac.m in Sources */,
+				BBD7FE092A13241E00F96075 /* KMOutlineEditViewController.swift in Sources */,
 				BBC3485029582920008D2CD1 /* KMBackgroundColorView.swift in Sources */,
 				ADB1FE982975300B00ED072D /* KMBatchHeaderAndFooterView.swift in Sources */,
 				BBAFC86229851B2D00D0648E /* KMPDFEditAppendCustomView.m in Sources */,
@@ -12276,6 +12293,7 @@
 				9F0CB4CF298654FA00007028 /* KMDesignToken+Height.swift in Sources */,
 				ADA08A8C29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */,
 				BBC347FF295448DE008D2CD1 /* KMWatermarkTemplateModel.swift in Sources */,
+				BBD7FE042A13218F00F96075 /* KMWatermarkAdjectivePropertyBaseController.swift in Sources */,
 				89752DA12936EC50003FF08E /* KMToolbar.m in Sources */,
 				9F1FE4F229406E4700E952CA /* BackgroundGradientView.m in Sources */,
 				896933D229AEED520055327F /* SKTextFieldSheetController.m in Sources */,
@@ -12377,8 +12395,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				BBFBE73028DD7C43008B2335 /* PDF_ Master_DMGTests.swift in Sources */,
-				899E0B0B2919244500B13D34 /* KMCustomTableRowView.swift in Sources */,
-				89E9B408295D268E00AEFA61 /* KMEditImagePropertyViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -13091,60 +13107,65 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = "PDF Master DMG/PDF_Master_DMG.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = Q43DRF894U;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFWindowController/PDFSDK",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFWindowController/PDFSDK",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/Convert/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/Convert/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/Convert/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/Convert/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFWindowController/PDFSDK",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFWindowController/PDFSDK",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/OCR/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/OCR/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/OCR/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/OCR/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/Home/NSObject/Services",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/Home/NSObject/Services",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/Home/NSObject/Services",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/Home/NSObject/Services",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFWindowController/PDFSDK",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFWindowController/PDFSDK",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 					"VERSION_DMG=1",
-					"VERSION_FREE=1",
 				);
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "PDF-Office-DMG-Info.plist";
+				INFOPLIST_FILE = "PDF-Master-DMG-Info.plist";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_KEY_NSMainStoryboardFile = Main;
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
@@ -13183,12 +13204,14 @@
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.kdanmobile.PDF-Office-DMG";
+				PRODUCT_BUNDLE_IDENTIFIER = com.pdftechnologies.pdfreader.dmg;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF Master DMG-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Master DMG-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Master-Swift.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 			};
@@ -13200,58 +13223,61 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = "PDF Master DMG/PDF_Master_DMG.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = Q43DRF894U;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFWindowController/PDFSDK",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFWindowController/PDFSDK",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/Convert/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/Convert/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/Convert/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/Convert/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFWindowController/PDFSDK",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFWindowController/PDFSDK",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/OCR/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/OCR/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/OCR/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/OCR/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/Home/NSObject/Services",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/Home/NSObject/Services",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/Home/NSObject/Services",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/Home/NSObject/Services",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/Home/NSObject/Services",
 					"$(PROJECT_DIR)/PDF\\ Office/Class/PDFTools/OCR/Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
-					"$(PROJECT_DIR)/PDF\\ Office/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFWindowController/PDFSDK",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFWindowController/PDFSDK",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
+					"$(PROJECT_DIR)/PDF\\ Master/Third\\ Pard\\ Library",
 				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"VERSION_DMG=1",
-					"VERSION_FREE=1",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "VERSION_DMG=1";
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "PDF-Office-DMG-Info.plist";
+				INFOPLIST_FILE = "PDF-Master-DMG-Info.plist";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_KEY_NSMainStoryboardFile = Main;
 				INFOPLIST_KEY_NSPrincipalClass = NSApplication;
@@ -13290,12 +13316,14 @@
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
 					"$(PROJECT_DIR)/PDF\\ Master/Class/PDFTools/Convert/Library",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.kdanmobile.PDF-Office-DMG";
+				PRODUCT_BUNDLE_IDENTIFIER = com.pdftechnologies.pdfreader.dmg;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF Master DMG-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Master DMG-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "PDF_Master-Swift.h";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -382,9 +382,63 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
+<<<<<<< HEAD
             startingLineNumber = "907"
             endingLineNumber = "907"
             landmarkName = "redact_menuItemClick_apply(sender:)"
+=======
+            startingLineNumber = "886"
+            endingLineNumber = "886"
+            landmarkName = "exportStampImage(sender:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F9F83569-E288-4245-8693-296A9832A13D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMPDFThumbnailView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "121"
+            endingLineNumber = "121"
+            landmarkName = "reloadData(indexs:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F93ADA37-6CA6-4606-8C55-B4CE999D9E33"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMPDFThumbnailView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "50"
+            endingLineNumber = "50"
+            landmarkName = "annotationShowState"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "00CC0545-23B7-4CD1-A9A9-C58034357BD8"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1812"
+            endingLineNumber = "1812"
+            landmarkName = "-updateInkStype:"
+>>>>>>> develop
             landmarkType = "7">
             <Locations>
                <Location
@@ -430,9 +484,15 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
+<<<<<<< HEAD
             startingLineNumber = "1951"
             endingLineNumber = "1951"
             landmarkName = "-opacitySliderAction:"
+=======
+            startingLineNumber = "1955"
+            endingLineNumber = "1955"
+            landmarkName = "-borderOpacitySliderAction:"
+>>>>>>> develop
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -446,9 +506,15 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
+<<<<<<< HEAD
             startingLineNumber = "2017"
             endingLineNumber = "2017"
             landmarkName = "-opacityComboBoxAction:"
+=======
+            startingLineNumber = "2021"
+            endingLineNumber = "2021"
+            landmarkName = "-borderWidthSliderAction:"
+>>>>>>> develop
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -462,6 +528,7 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
+<<<<<<< HEAD
             startingLineNumber = "2069"
             endingLineNumber = "2069"
             landmarkName = "-centerAlignButtonAction:"
@@ -769,6 +836,75 @@
             startingLineNumber = "1882"
             endingLineNumber = "1882"
             landmarkName = "changeModelAction(mode:)"
+=======
+            startingLineNumber = "2073"
+            endingLineNumber = "2073"
+            landmarkName = "-currentFontColorButtonAction:"
+>>>>>>> develop
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "582C1953-1AB9-4F9E-9580-64406EB3B3E9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowser.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "34"
+            endingLineNumber = "34"
+            landmarkName = "closeTabViewItem()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "CC74B4E6-E408-4A0F-BD70-517BA46123AA"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Document/KMDocumentController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "141"
+            endingLineNumber = "141"
+            landmarkName = "importFromScanner(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "11B3121E-983F-4CCF-8914-387F8FCFE2E9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1271"
+            endingLineNumber = "1271"
+            landmarkName = "popoverItemAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "00E353BF-BFD3-4F71-BAF3-95192710FFEB"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1326"
+            endingLineNumber = "1326"
+            landmarkName = "importFromScanner(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

PDF Office/PDF Master/Class/ChromiumTabs/src/Browser Window/CTBrowserWindowController.m

@@ -13,7 +13,11 @@
 #import "CTUtil.h"
 #import "FastResizeView.h"
 #import "CTTabController.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 #import "common.h"
 
 //#import "scoped_nsdisable_screen_updates.h"

PDF Office/PDF Master/Class/ChromiumTabs/src/Browser Window/CTTabWindowController.m

@@ -5,7 +5,11 @@
 #import "CTTabWindowController.h"
 #import "CTTabStripView.h"
 #import "common.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface CTTabWindowController(PRIVATE)
 - (void)setUseOverlay:(BOOL)useOverlay;

PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripModel.m

@@ -13,7 +13,11 @@
 
 #import "CTTabContents.h"
 #import "PDF_Master-Bridging-Header.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 #import "common.h"
 
 @interface CTTabStripModel (PrivateMethods)

PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripView.m

@@ -5,7 +5,11 @@
 #import "CTTabStripView.h"
 #import "CTTabStripController.h"
 #import "URLDropTarget.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 // ripped out from libbase mac_util.mm:
 static BOOL ShouldWindowsMiniaturizeOnDoubleClick() {

PDF Office/PDF Master/Class/ChromiumTabs/src/Tab/CTTabController.m

@@ -7,7 +7,11 @@
 #import "CTTabView.h"
 #import "CTUtil.h"
 #import "HoverCloseButton.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 static NSString* const kBrowserThemeDidChangeNotification =
 @"BrowserThemeDidChangeNotification";

PDF Office/PDF Master/Class/Common/OC/Property/SKInfoWindowController.m

@@ -43,7 +43,11 @@
 #import <Quartz/Quartz.h>
 //#import "SKMainWindowController.h"
 
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 #define SKInfoWindowFrameAutosaveName @"SKInfoWindow"
 

PDF Office/PDF Master/Class/Common/OC/Tools/KMTools_OC.h

@@ -7,6 +7,12 @@
 
 #import <Foundation/Foundation.h>
 
+typedef NS_ENUM(NSUInteger, KMAppTarget) {
+    KMAppTargetFree = 0,
+    KMAppTargetPro = 1,
+    KMAppTargetDMG = 2
+};
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KMTools_OC : NSObject
@@ -15,6 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (BOOL) setPreviewAsDefaultApplicationForFileExtension:(NSString *) fileExtension;
 + (BOOL)setMyselfAsDefaultApplicationForFileExtension:(NSString *) fileExtension;
 
++ (KMAppTarget)getAppTarget;
+
 @end
 
 @interface KMTools_OC (Testing)

PDF Office/PDF Master/Class/Common/OC/Tools/KMTools_OC.m

@@ -50,6 +50,22 @@
     return UTIString;
 }
 
++ (KMAppTarget)getAppTarget {
+    // VERSION_DMG=1
+    // VERSION_FREE=1
+    // VERSION_PRO=1
+#if VERSION_FREE
+    return KMAppTargetFree;
+#endif
+#if VERSION_PRO
+    return KMAppTargetPro;
+#endif
+#if VERSION_DMG
+    return KMAppTargetDMG;
+#endif
+    return KMAppTargetFree;
+}
+
 @end
 
 @implementation KMTools_OC (Testing)

PDF Office/PDF Master/Class/Common/Tools/KMTools.swift

@@ -87,8 +87,21 @@ import Cocoa
     // MARK: -
     // MARK: 打开网页
     
-    @objc class func openURL(_ url: URL) {
-        NSWorkspace.shared.open(url)
+    @objc class func openURL(url: URL?) {
+        guard let _url = url else {
+            KMPrint("url invalid.")
+            return
+        }
+        NSWorkspace.shared.open(_url)
+    }
+    
+    @objc class func openURL(urlString: String?) {
+        guard let _urlString = urlString else {
+            KMPrint("url invalid.")
+            return
+        }
+        
+        KMTools.openURL(url: URL(string: _urlString))
     }
     
     // MARK: -
@@ -182,9 +195,7 @@ extension KMTools {
         
         let path = Bundle.main.path(forResource: fileName, ofType: fileType)
         if (path == nil || FileManager.default.fileExists(atPath: path!) == false) {
-            // MARK: -
-            // MARK: url需要替换
-            KMTools.openURL(URL(string: "https://www.pdfreaderpro.com/help")!)
+            KMTools.openURL(url: URL(string: "https://www.pdfreaderpro.com/help"))
             return
         }
         
@@ -223,23 +234,23 @@ extension KMTools {
     
     // 打开 [更多产品] 网站
     @objc class func openMoreProductWebsite() {
-        // MARK: -
-        // FIXME: url需要替换
-        KMTools.openURL(URL(string: "https://www.pdfreaderpro.com/product?utm_source=MacApp&utm_campaign=ProductLink&utm_medium=PdfProduct")!)
+        KMTools.openURL(url: URL(string: "https://www.pdfreaderpro.com/product?utm_source=MacApp&utm_campaign=ProductLink&utm_medium=PdfProduct"))
     }
     
     // 打开 [免费 PDF 模板] 网站
     @objc class func openFreePDFTemplatesWebsite() {
-        // MARK: -
-        // MARK: url需要替换
-        KMTools.openURL(URL(string: "https://www.pdfreaderpro.com/templates?utm_source=MacApp&utm_campaign=TemplatesLink&utm_medium=PdfTemplates")!)
+        KMTools.openURL(url: URL(string: "https://www.pdfreaderpro.com/templates?utm_source=MacApp&utm_campaign=TemplatesLink&utm_medium=PdfTemplates"))
     }
     
     // 打开 [ComPDFKit 授权] 网站
     @objc class func openComPDFKitPowerWebsite() {
-        // MARK: -
-        // MARK TODO: url需要替换
-        KMTools.openURL(URL(string: "https://www.compdf.com/?utm_source=macapp&utm_medium=pdfmac&utm_campaign=compdfkit-promp")!)
+        KMTools.openURL(url: URL(string: "https://www.compdf.com/?utm_source=macapp&utm_medium=pdfmac&utm_campaign=compdfkit-promp"))
+    }
+    
+    // 打开 [官网 下载页] 网站
+    // 测试环境 http://test-pdf-pro.kdan.cn:3021/pdf-master-mac-download
+    @objc class func openDownloadDMGWebsite() {
+        KMTools.openURL(urlString: "https://www.pdfreaderpro.com/pdf-master-mac-download")
     }
     
     // 意见反馈
@@ -268,15 +279,16 @@ extension KMTools {
     }
     
     @objc class func getAppName() -> String {
-        var name = "PDF Master"
-        // VERSION_FREE
-        #if VERSION_PRO
-        name = "PDF Master Pro"
-        #endif
-        #if VERSION_DMG
-        name = "PDF Master DMG"
-        #endif
-       return name
+        let appTarget = KMTools_OC.getAppTarget()
+        if (appTarget == .free) {
+            return "PDF Master"
+        } else if (appTarget == .pro) {
+            return "PDF Master Pro"
+        } else if (appTarget == .DMG) {
+//            return "PDF Master DMG"
+            return "PDF Master"
+        }
+        return "PDF Master"
     }
     
     @objc class func pageRangeTypeString(pageRange: KMPageRange) -> String {
@@ -296,7 +308,5 @@ extension KMTools {
         case .vertical:
             return NSLocalizedString("Vertical Pages", comment: "")
         }
-        
-        return ""
     }
 }

PDF Office/PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m

@@ -15,7 +15,11 @@
 #import "KMBlankView.h"
 #import <Masonry/Masonry.h>
 #import "KMImageAccessoryController.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 #import "CTBrowserWindowController.h"
 #import "NSButton+TitleColor.h"
 #import "KMPDFMergeFileNameTabelViewCell.h"

PDF Office/PDF Master/Class/Merge/OCPart/KMPDFMergeFileNameTabelViewCell.m

@@ -6,7 +6,11 @@
 //
 
 #import "KMPDFMergeFileNameTabelViewCell.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface KMPDFMergeFileNameTabelViewCell ()
 

PDF Office/PDF Master/Class/PDFTools/OCR/KMDocumentAIViewController.m

@@ -11,7 +11,11 @@
 #import "KMFileAttribute.h"
 #import "KMOCRComboBox.h"
 #import "NSButton+TitleColor.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 #import <Masonry/Masonry.h>
 
 #define kIndicatorWidth  32.0

PDF Office/PDF Master/Class/PDFTools/Watermark/OCPart/KMWatermarkPDFView_OC.m

@@ -6,7 +6,11 @@
 //
 
 #import "KMWatermarkPDFView_OC.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface KMWatermarkPDFView_OC ()
 

PDF Office/PDF Master/Class/PDFTools/Watermark/Tools/KMWatermarkAdjectiveTools.swift

@@ -130,7 +130,7 @@ case bates = 4
             return .watermark
         }
         
-        return PDF_Master.KMWatermarkAdjectiveType(rawValue: 0)!
+        return .watermark
     }
     
     class func KMToolBarTypeToRightSubViewType(_ type: KMToolbarType) -> RightSubViewType {

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListAnnotationNoteWindowController.m

@@ -12,7 +12,11 @@
 
 #import "CPDFListAnnotationNoteWindowController.h"
 #import "CPDFListView.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 #import "NSTextView+KMExtension.h"
 
 static char CNoteWindowNoteObservationContext;

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.m

@@ -14,7 +14,11 @@
 
 #import "CPDFAnnotationModel.h"
 #import "CPDFListView.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface CPDFListEditAnnotationViewController ()
 

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/ComPDFUIConfig.m

@@ -16,7 +16,11 @@
 
 #import "NSImage+PDFListView.h"
 #import "CPDFListViewConfig.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @implementation ComPDFUIConfig
 

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMNoteOutlineFilterViewController.m

@@ -11,7 +11,11 @@
 #import "KMNoteFilterCollevtionViewItem.h"
 #import "KMNoteColorCollectionViewItem.h"
 #import "KMNoteTypeCollectionViewItem.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 NSString *KMNoteOutlineFilterSelectArray_Type = @"KMNoteOutlineFilterSelectArray_Type";
 NSString *KMNoteOutlineFilterSelectArray_Author = @"KMNoteOutlineFilterSelectArray_Author";

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteColorCollectionViewItem.h

@@ -6,7 +6,11 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface KMNoteColorCollectionViewItem : NSCollectionViewItem
 @property (weak) IBOutlet NSBox *colorBox;

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteFilterCollevtionViewItem.m

@@ -6,7 +6,11 @@
 //
 
 #import "KMNoteFilterCollevtionViewItem.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 @interface KMFilterAuthorLabel : NSView
 
 @property (nonatomic,copy) void (^mouseDownCallback) (BOOL downEntered);

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTypeCollectionViewItem.h

@@ -6,7 +6,11 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface KMNoteTypeCollectionViewItem : NSCollectionViewItem
 

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m

@@ -12,7 +12,11 @@
 #import "KMSelfSignAnnotationFreeText.h"
 #import "NSString_SKExtensions.h"
 #import "KMAnnotationStampViewController.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 #import "KMSignatureAnnotationViewController.h"
 #import "CSelfSignAnnotation.h"
 #import "CSelfSignAnnotationFreeText.h"

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerViewController.m

@@ -8,7 +8,11 @@
 #import "KMColorPickerViewController.h"
 #import "KMAnnotationPropertiesColorManager.h"
 #import <QuartzCore/QuartzCore.h>
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface KMColorPickerViewController ()
 

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m

@@ -18,7 +18,11 @@
 #import "NSFont_SKExtensions.h"
 #import "NSMenu+Category.h"
 #import "KMPropertiesViewPopController.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface KMGeneralAnnotationViewController () <NSTextViewDelegate, NSPopoverDelegate, KMSelectPopButtonDelegate>
 

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m

@@ -12,7 +12,11 @@
 #import "NSMenu+Category.h"
 #import "CStampSignatureObject.h"
 #import "KMSigntureViewItem.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface KMSignatureAnnotationViewController ()<NSCollectionViewDelegate,
 NSCollectionViewDataSource,

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m

@@ -16,7 +16,11 @@
 #import "NSMenu+Category.h"
 #import "CPDFListView.h"
 #import "NSButton+TitleColor.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 #import "KMCoverButton.h"
 #import "KMSignatureHelpViewController.h"
 

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSigntureViewItem.m

@@ -7,7 +7,11 @@
 
 #import "KMSigntureViewItem.h"
 #import "NSMenu+Category.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 @interface KMSigntureViewItem ()
 

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbar.m

@@ -11,7 +11,11 @@
 #import "NSWindow+PopOver.h"
 #import <Masonry/Masonry.h>
 //#import "NSPopover+PDFListView.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
 
 NSString *KMNewToolbarSpaceItemIdentifier = @"KMNewToolbarSpaceItemIdentifier";
 NSString *KMToolbarDividerItemIdentifier = @"KMToolbarDividerItemIdentifier";

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -190,6 +190,10 @@ class KMToolbarController: NSViewController {
         self.findChildItem(identifier)?.isSelected = false
     }
     
+    public func clickItem(_ identifier: String) {
+        self.selectItem(identifier)
+    }
+    
     public func selectItem(_ identifier: String) {
         if (isMainToolItem(identifier)) {
             self.selectMainItem(identifier)

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift

@@ -373,37 +373,61 @@ extension KMMainViewController {
     
     @IBAction func menuItemAction_squre(_ sender: Any) {
         UserDefaults.standard.set(6, forKey: KMToolBarToolPDFShapeStyle)
-        self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
-        if self.listView.annotationType == .unkown {
-            UserDefaults.standard.set(6, forKey: KMToolBarToolPDFShapeStyle)
-            self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
+
+        if (self.listView.annotationType == .square) {
+            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+        } else {
+            if (self.listView.annotationType == .circle || self.listView.annotationType == .line || self.listView.annotationType == .arrow) {
+                self.listView.annotationType = .square
+                self.rightSideViewController.annotationProperties.annotationMode = .square
+            } else {
+                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+            }
         }
     }
 
     @IBAction func menuItemAction_circle(_ sender: Any) {
         UserDefaults.standard.set(7, forKey: KMToolBarToolPDFShapeStyle)
-        self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
-        if self.listView.annotationType == .unkown {
-            UserDefaults.standard.set(7, forKey: KMToolBarToolPDFShapeStyle)
-            self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
+
+        if (self.listView.annotationType == .circle) { // 取消
+            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+        } else {
+            if (self.listView.annotationType == .square || self.listView.annotationType == .line || self.listView.annotationType == .arrow) { // 切换
+                self.listView.annotationType = .circle
+                self.rightSideViewController.annotationProperties.annotationMode = .circle
+            } else { // 选中
+                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+            }
         }
     }
     
     @IBAction func menuItemAction_arrow(_ sender: Any) {
         UserDefaults.standard.set(5, forKey: KMToolBarToolPDFShapeStyle)
-        self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
-        if self.listView.annotationType == .unkown {
-            UserDefaults.standard.set(5, forKey: KMToolBarToolPDFShapeStyle)
-            self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
+
+        if (self.listView.annotationType == .arrow) { // 取消
+            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+        } else { // 选中
+            if (self.listView.annotationType == .square || self.listView.annotationType == .circle || self.listView.annotationType == .line) { // 切换
+                self.listView.annotationType = .arrow
+                self.rightSideViewController.annotationProperties.annotationMode = .arrow
+            } else {
+                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+            }
         }
     }
     
     @IBAction func menuItemAction_line(_ sender: Any) {
         UserDefaults.standard.set(4, forKey: KMToolBarToolPDFShapeStyle)
-        self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
-        if self.listView.annotationType == .unkown {
-            UserDefaults.standard.set(4, forKey: KMToolBarToolPDFShapeStyle)
-            self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
+
+        if (self.listView.annotationType == .line) { // 取消
+            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+        } else { // 选中
+            if (self.listView.annotationType == .square || self.listView.annotationType == .circle || self.listView.annotationType == .arrow) { // 切换
+                self.listView.annotationType = .line
+                self.rightSideViewController.annotationProperties.annotationMode = .line
+            } else {
+                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+            }
         }
     }
 

PDF Office/PDF Master/Class/Welcome/OC/WelcomeWindowController.m

@@ -8,7 +8,12 @@
 
 #import "WelcomeWindowController.h"
 #import "WaitingView.h"
+#if VERSION_DMG
 #import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
+
 #import "TCPageIndicator.h"
 #import "NSButton+TitleColor.h"
 

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

@@ -2,9 +2,9 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import <ComPDFKit/ComPDFKit.h>
-#import "ComPDFUIKit.h"
+#import "ComPDFKit/ComPDFKit.h"
 #import "CPDFListView+Event.h"
+#import "ComPDFUIKit.h"
 
 #import "KMGOCRManager.h"
 
@@ -15,28 +15,43 @@
 #import "KMToolbar.h"
 #import <ComPDFKit_Conversion/ComPDFKit_Conversion.h>
 //#import <ComDocumentAIKit/ComDocumentAIKit.h>
+#import "CTTabContents.h"
+#import "CTBrowser.h"
+#import "CTBrowserWindowController.h"
+#import "CTTabWindowController.h"
+#import "CTTabStripModel.h"
+#import "CTTabStripView.h"
+#import "CTTabController.h"
+#import "KMNoteTypeImageView.h"
+#import "KMSharingServicePicker+ESSSharingServicePickerMenu.h"
+#import "CPDFListView+Public.h"
+#import "KMGeneralAnnotationViewController.h"
+#import "KMAnnotationPropertiesViewController.h"
+#import "KMDocumentAIViewController.h"
 
 #import "CPDFListView+Tool.h"
 #import "NSBitmapImageRep_SKExtensions.h"
 #import "CPDFPage+PDFListView.h"
-#import "CPDFListView+Public.h"
-#import "KMGeneralAnnotationViewController.h"
-#import "KMAnnotationPropertiesViewController.h"
+#import "KMPopUpButton.h"
+#import <Masonry/Masonry.h>
 #import "TextFieldFormatter.h"
 #import "CustomAlertView.h"
 #import "KMPDFEditAppendWindow.h"
+
 #import "KMWatermarkPDFView_OC.h"
-#import "KMDocumentAIViewController.h"
 #import "NSFont_SKExtensions.h"
 #import "NSUserDefaults+PDFListView.h"
 #import "KMSplitView.h"
-#import "KMNoteOutlineFilterViewController.h"
 #import "KMAnnotationPropertiesColorManager.h"
 
 #import "KMConvertURLToPDF.h"
+#import "KMSplitView.h"
 #import "KMCloudServer.h"
 #import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
 #import "KMCloudOperation.h"
+#import "KMNoteOutlineFilterViewController.h"
+#import "KMSecondaryViewController.h"
+#import "NSString_SKExtensions.h"
 #import "NSButton+TitleColor.h"
 //
 #import "KMPrintAccessoryController_OC.h"
@@ -44,14 +59,22 @@
 #import "KMMailHelper.h"
 //
 #import "SKProgressController.h"
+#import "KMSelfSignAnnotationFreeText.h"
 
 #import "CStringConstants.h"
 #import "NSUserDefaults+PDFListView.h"
+
+#import "KMCellEmptyView.h"
+#import "KMSelfSignAnnotation.h"
 #import "SKTextFieldSheetController.h"
+#import "KMConvertPDFManagerOC.h"
 #import "GBDeviceInfo.h"
 #import "KMEmailSubWindowController.h"
 #import "SKInfoWindowController.h"
 #import "SKKeychain.h"
+#import "NSColor_SKExtensions.h"
+#import "CSelfSignAnnotationFreeText.h"
+#import "CSelfSignAnnotation.h"
 #import "WelcomeWindowController.h"
 #import "KMTools_OC.h"
 //广告

PDF Office/PDF-Master-DMG-Info.plist

@@ -2,6 +2,288 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ATSApplicationFontsPath</key>
+	<string>Fonts</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>pdf</string>
+				<string>PDF</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string></string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/pdf</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Adobe PDF document</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>PDF</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+			<key>LSIsAppleDefaultForType</key>
+			<string>Yes</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.adobe.pdf</string>
+			</array>
+			<key>NSDocumentClass</key>
+			<string>$(PRODUCT_MODULE_NAME).KMMainDocument</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>ai</string>
+				<string>AI</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>DocumentType</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.adobe.illustrator.ai-image</string>
+			</array>
+			<key>NSDocumentClass</key>
+			<string>$(PRODUCT_MODULE_NAME).KMMainDocument</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Images</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.adobe.postscript</string>
+			</array>
+			<key>NSDocumentClass</key>
+			<string>$(PRODUCT_MODULE_NAME).KMMainDocument</string>
+			<key>NSExportableTypes</key>
+			<array>
+				<string>com.adobe.pdf</string>
+				<string>net.sourceforge.skim-app.pdfd</string>
+				<string>com.adobe.postscript</string>
+				<string>com.adobe.encapsulated-postscript</string>
+				<string>org.tug.tex.dvi</string>
+				<string>org.tug.tex.xdv</string>
+				<string>net.sourceforge.skim-app.skimnotes</string>
+				<string>public.plain-text</string>
+				<string>public.rtf</string>
+				<string>com.apple.rtfd</string>
+				<string>com.adobe.fdf</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Encapsulated PostScript</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.adobe.encapsulated-postscript</string>
+			</array>
+			<key>NSDocumentClass</key>
+			<string>$(PRODUCT_MODULE_NAME).KMMainDocument</string>
+			<key>NSExportableTypes</key>
+			<array>
+				<string>com.adobe.pdf</string>
+				<string>net.sourceforge.skim-app.pdfd</string>
+				<string>com.adobe.postscript</string>
+				<string>com.adobe.encapsulated-postscript</string>
+				<string>org.tug.tex.dvi</string>
+				<string>org.tug.tex.xdv</string>
+				<string>net.sourceforge.skim-app.skimnotes</string>
+				<string>public.plain-text</string>
+				<string>public.rtf</string>
+				<string>com.apple.rtfd</string>
+				<string>com.adobe.fdf</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>DVI</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>org.tug.tex.dvi</string>
+			</array>
+			<key>NSDocumentClass</key>
+			<string>$(PRODUCT_MODULE_NAME).KMMainDocument</string>
+			<key>NSExportableTypes</key>
+			<array>
+				<string>com.adobe.pdf</string>
+				<string>net.sourceforge.skim-app.pdfd</string>
+				<string>com.adobe.postscript</string>
+				<string>com.adobe.encapsulated-postscript</string>
+				<string>org.tug.tex.dvi</string>
+				<string>org.tug.tex.xdv</string>
+				<string>net.sourceforge.skim-app.skimnotes</string>
+				<string>public.plain-text</string>
+				<string>public.rtf</string>
+				<string>com.apple.rtfd</string>
+				<string>com.adobe.fdf</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>XDV</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>org.tug.tex.xdv</string>
+			</array>
+			<key>NSDocumentClass</key>
+			<string>$(PRODUCT_MODULE_NAME).KMMainDocument</string>
+			<key>NSExportableTypes</key>
+			<array>
+				<string>com.adobe.pdf</string>
+				<string>net.sourceforge.skim-app.pdfd</string>
+				<string>com.adobe.postscript</string>
+				<string>com.adobe.encapsulated-postscript</string>
+				<string>org.tug.tex.dvi</string>
+				<string>org.tug.tex.xdv</string>
+				<string>net.sourceforge.skim-app.skimnotes</string>
+				<string>public.plain-text</string>
+				<string>public.rtf</string>
+				<string>com.apple.rtfd</string>
+				<string>com.adobe.fdf</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>PDF Reader Pro Edition Notes</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>net.sourceforge.skim-app.skimnotes</string>
+			</array>
+			<key>NSDocumentClass</key>
+			<string>$(PRODUCT_MODULE_NAME).KMMainDocument</string>
+			<key>NSExportableTypes</key>
+			<array>
+				<string>net.sourceforge.skim-app.skimnotes</string>
+				<string>public.plain-text</string>
+				<string>public.rtf</string>
+				<string>com.apple.rtfd</string>
+				<string>com.adobe.fdf</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Notes as Text</string>
+			<key>CFBundleTypeRole</key>
+			<string>None</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>public.rtf</string>
+			</array>
+			<key>NSDocumentClass</key>
+			<string></string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Notes as RTF</string>
+			<key>CFBundleTypeRole</key>
+			<string>None</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>public.rtf</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Notes as RTFD</string>
+			<key>CFBundleTypeRole</key>
+			<string>None</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.apple.rtfd</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Notes as FDF</string>
+			<key>CFBundleTypeRole</key>
+			<string>None</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.adobe.fdf</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Folder</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>public.folder</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>jpg</string>
+				<string>cur</string>
+				<string>bmp</string>
+				<string>jpeg</string>
+				<string>gif</string>
+				<string>png</string>
+				<string>tiff</string>
+				<string>tif</string>
+				<string>ico</string>
+				<string>icns</string>
+				<string>tga</string>
+				<string>psd</string>
+				<string>eps</string>
+				<string>hdr</string>
+				<string>jp2</string>
+				<string>jpc</string>
+				<string>pict</string>
+				<string>sgi</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Images</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>NSDocumentClass</key>
+			<string>KMImageDocument</string>
+		</dict>
+	</array>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

PDF Office/PDF Master DMG/PDF_ Master_DMG.entitlements

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
-    <true/>
-</dict>
+<dict/>
 </plist>