Ver Fonte

【冲突】文件缺失补充

lizhe há 1 ano atrás
pai
commit
bccf93403e

+ 16 - 16
PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -1285,6 +1285,9 @@
 		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 */; };
 		ADA08A8729F14336009B2A7B /* ComPDFKit_Conversion.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADA08A8029F13EE1009B2A7B /* ComPDFKit_Conversion.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		ADA08A8A29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */; };
+		ADA08A8B29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */; };
+		ADA08A8C29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */; };
 		ADB1FE28297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
 		ADB1FE29297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
 		ADB1FE2A297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
@@ -2549,9 +2552,6 @@
 		BBA5429C29F13A140041BAD0 /* KMMemorandumPattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA5429B29F13A140041BAD0 /* KMMemorandumPattern.swift */; };
 		BBA5429D29F13A140041BAD0 /* KMMemorandumPattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA5429B29F13A140041BAD0 /* KMMemorandumPattern.swift */; };
 		BBA5429E29F13A140041BAD0 /* KMMemorandumPattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA5429B29F13A140041BAD0 /* KMMemorandumPattern.swift */; };
-		BBA542A129F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA542A029F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift */; };
-		BBA542A229F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA542A029F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift */; };
-		BBA542A329F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA542A029F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift */; };
 		BBA762D229D2D98D00844513 /* KMCommonDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA762D129D2D98D00844513 /* KMCommonDefine.swift */; };
 		BBA762D329D2D98D00844513 /* KMCommonDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA762D129D2D98D00844513 /* KMCommonDefine.swift */; };
 		BBA762D429D2D98D00844513 /* KMCommonDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA762D129D2D98D00844513 /* KMCommonDefine.swift */; };
@@ -3730,6 +3730,7 @@
 		AD9527ED295578BD0039D2BC /* KMBaseTextFieldPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBaseTextFieldPresenter.swift; sourceTree = "<group>"; };
 		ADA08A7C29F13EA0009B2A7B /* ComPDFKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ComPDFKit.framework; sourceTree = "<group>"; };
 		ADA08A8029F13EE1009B2A7B /* ComPDFKit_Conversion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ComPDFKit_Conversion.framework; sourceTree = "<group>"; };
+		ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMPDFViewAnnotationOnceModeStore.swift; sourceTree = "<group>"; };
 		ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchWindowController.swift; sourceTree = "<group>"; };
 		ADB1FE27297006DF00ED072D /* KMBatchWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatchWindowController.xib; sourceTree = "<group>"; };
 		ADB1FE30297008E800ED072D /* KMBatchCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchCollectionView.swift; sourceTree = "<group>"; };
@@ -4270,7 +4271,6 @@
 		BBA4C8A929D59CA400AD825B /* TCPageIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TCPageIndicator.m; sourceTree = "<group>"; };
 		BBA4C8AA29D59CA400AD825B /* TCPageIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TCPageIndicator.h; sourceTree = "<group>"; };
 		BBA5429B29F13A140041BAD0 /* KMMemorandumPattern.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMMemorandumPattern.swift; sourceTree = "<group>"; };
-		BBA542A029F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFViewAnnotationOnceModeStore.swift; sourceTree = "<group>"; };
 		BBA762D129D2D98D00844513 /* KMCommonDefine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCommonDefine.swift; sourceTree = "<group>"; };
 		BBA8B7A12935CD740097D183 /* KMRemovePasswordAlertWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMRemovePasswordAlertWindowController.swift; sourceTree = "<group>"; };
 		BBA8B7A22935CD740097D183 /* KMRemovePasswordAlertWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMRemovePasswordAlertWindowController.xib; sourceTree = "<group>"; };
@@ -5871,6 +5871,14 @@
 			path = Presenter;
 			sourceTree = "<group>";
 		};
+		ADA08A8829F21A53009B2A7B /* Tools */ = {
+			isa = PBXGroup;
+			children = (
+				ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */,
+			);
+			path = Tools;
+			sourceTree = "<group>";
+		};
 		ADB1FE21297005DF00ED072D /* Batch */ = {
 			isa = PBXGroup;
 			children = (
@@ -7135,7 +7143,7 @@
 		BB2C6A7328F2656000478A33 /* PDFWindowController */ = {
 			isa = PBXGroup;
 			children = (
-				BBA5429F29F1400D0041BAD0 /* Tools */,
+				ADA08A8829F21A53009B2A7B /* Tools */,
 				ADBC375B29CC619200D93208 /* ReadModelView */,
 				9FDD0F58294AB3E7000C4DAD /* ViewController */,
 				89752D982936E4DE003FF08E /* Toolbar */,
@@ -7915,14 +7923,6 @@
 			path = Control;
 			sourceTree = "<group>";
 		};
-		BBA5429F29F1400D0041BAD0 /* Tools */ = {
-			isa = PBXGroup;
-			children = (
-				BBA542A029F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift */,
-			);
-			path = Tools;
-			sourceTree = "<group>";
-		};
 		BBA8B7AD293600590097D183 /* Window */ = {
 			isa = PBXGroup;
 			children = (
@@ -9731,7 +9731,6 @@
 				9F78EFC628F7E965001E66F4 /* KMHomeViewController+UI.swift in Sources */,
 				BB8F4582295B0F900037EA22 /* KMHeaderFooterMarginInfoView.swift in Sources */,
 				BB52372729C313CA00663BD7 /* KMAnnotationPropertyBaseController.m in Sources */,
-				BBA542A129F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift in Sources */,
 				9FDD0FAA29534FCC000C4DAD /* KMAliasLight.swift in Sources */,
 				BB147029299DC0D100784A6A /* OIDAuthorizationService.m in Sources */,
 				9FF94F1129A7476000B1EF69 /* KMDesignPropertySelector.swift in Sources */,
@@ -10191,6 +10190,7 @@
 				9F1F82C3292F113A0092C4B4 /* KMHomeDragView.swift in Sources */,
 				9F080B14298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */,
 				BBB14A5F297929BD00936EDB /* KMRedactPageRangeWindowController.swift in Sources */,
+				ADA08A8A29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */,
 				89E4E7822967BF5A002DBA6F /* KMCustomizeStampViewController.m in Sources */,
 				89E4E7052963D588002DBA6F /* KMBox.m in Sources */,
 				9F8DDF2D2924B855006CDC73 /* KMPDFToolsViewController.swift in Sources */,
@@ -10486,7 +10486,6 @@
 				9F1F82EF293609F60092C4B4 /* CPDFDocument+PageEditManager.swift in Sources */,
 				BB8F4583295B0F900037EA22 /* KMHeaderFooterMarginInfoView.swift in Sources */,
 				BB52372829C313CA00663BD7 /* KMAnnotationPropertyBaseController.m in Sources */,
-				BBA542A229F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift in Sources */,
 				9F1FE51229407B4000E952CA /* KMFileSearchView.swift in Sources */,
 				BB14702A299DC0D100784A6A /* OIDAuthorizationService.m in Sources */,
 				9FF94F1229A7476000B1EF69 /* KMDesignPropertySelector.swift in Sources */,
@@ -10946,6 +10945,7 @@
 				BB88E45929404752002B3655 /* KMPDFConvert.swift in Sources */,
 				9F080B15298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */,
 				BBB14A60297929BD00936EDB /* KMRedactPageRangeWindowController.swift in Sources */,
+				ADA08A8B29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */,
 				89E4E7832967BF5A002DBA6F /* KMCustomizeStampViewController.m in Sources */,
 				89E4E7062963D588002DBA6F /* KMBox.m in Sources */,
 				BB897252294C3F660045787C /* KMMenuTableView.swift in Sources */,
@@ -11441,7 +11441,6 @@
 				BBB9B318299A5D6D004F3235 /* KMDropboxManager.m in Sources */,
 				BB8F4559295AA1270037EA22 /* KMHeaderFooterPropertyInfoController.swift in Sources */,
 				89752DBA2936F9B9003FF08E /* NSButton+TitleColor.m in Sources */,
-				BBA542A329F1404C0041BAD0 /* KMPDFViewAnnotationOnceModeStore.swift in Sources */,
 				BB162E94294FFE020088E9D1 /* KMWatermarkModel.swift in Sources */,
 				F3A9DC80294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */,
 				AD867F9629D955BF00F00440 /* KMBOTAOutlineCellView.swift in Sources */,
@@ -11858,6 +11857,7 @@
 				ADC0761C298A2E67006C752F /* KMBatchSecurityViewPresenter.swift in Sources */,
 				BB146FCB299DC0D100784A6A /* GTMSessionFetcher.m in Sources */,
 				9F0CB4CF298654FA00007028 /* KMDesignToken+Height.swift in Sources */,
+				ADA08A8C29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */,
 				BBC347FF295448DE008D2CD1 /* KMWatermarkTemplateModel.swift in Sources */,
 				89752DA12936EC50003FF08E /* KMToolbar.m in Sources */,
 				9F1FE4F229406E4700E952CA /* BackgroundGradientView.m in Sources */,

PDF Office/PDF Office/Class/Common/Control/KMMemorandumPattern.swift → PDF Office/PDF Master/Class/Common/Control/KMMemorandumPattern.swift


PDF Office/PDF Office/Class/PDFWindowController/Tools/KMPDFViewAnnotationOnceModeStore.swift → PDF Office/PDF Master/Class/PDFWindowController/Tools/KMPDFViewAnnotationOnceModeStore.swift


BIN
PDF Office/PDF Office.xcodeproj/project.xcworkspace/xcuserdata/kdanmobile.xcuserdatad/UserInterfaceState.xcuserstate