Browse Source

Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

tangchao 1 year ago
parent
commit
07fe23e3d6
21 changed files with 2646 additions and 919 deletions
  1. 24 18
      PDF Office/PDF Master.xcodeproj/project.pbxproj
  2. 0 78
      PDF Office/PDF Master.xcodeproj/xcuserdata/kdanwj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  3. 13 8
      PDF Office/PDF Master/Class/Batch/WindowController/PasswordWindowController.swift
  4. 6 0
      PDF Office/PDF Master/Class/Home/Category/String+KMExtensions.swift
  5. 2 1
      PDF Office/PDF Master/Class/Home/WindowController/KMURLToPDFWindowController/KMURLToPDFWindowController.swift
  6. 9 0
      PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotation+PDFListView.swift
  7. 12 0
      PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFInkAnnotation+PDFListView.swift
  8. 5 0
      PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.h
  9. 11 0
      PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Extension.h
  10. 236 0
      PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Extension.m
  11. 13 13
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m
  12. 7 7
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/KMFormPropertPanelViewController.xib
  13. 14 0
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/CreateStamp/Controller/KMStampCreaterWindowController.swift
  14. 2 2
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/CreateStamp/View/KMAnnotationStamp.swift
  15. 37 0
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/CreateStamp/View/KMButtomCell.swift
  16. 0 24
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.h
  17. 0 473
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.m
  18. 1502 0
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.swift
  19. 655 198
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.xib
  20. 96 95
      PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMCustomizeStampViewController.xib
  21. 2 2
      PDF Office/PDF Master/PDF_Master-Bridging-Header.h

+ 24 - 18
PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -211,12 +211,6 @@
 		89E4E755296427E5002DBA6F /* NSImage_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E753296427E5002DBA6F /* NSImage_SKExtensions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		89E4E756296427E5002DBA6F /* NSImage_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E753296427E5002DBA6F /* NSImage_SKExtensions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		89E4E757296427E5002DBA6F /* NSImage_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E753296427E5002DBA6F /* NSImage_SKExtensions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		89E4E76129656A88002DBA6F /* KMAnnotationStampViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E75E29656A88002DBA6F /* KMAnnotationStampViewController.m */; };
-		89E4E76229656A88002DBA6F /* KMAnnotationStampViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E75E29656A88002DBA6F /* KMAnnotationStampViewController.m */; };
-		89E4E76329656A88002DBA6F /* KMAnnotationStampViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E75E29656A88002DBA6F /* KMAnnotationStampViewController.m */; };
-		89E4E76429656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */; };
-		89E4E76529656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */; };
-		89E4E76629656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */; };
 		89E4E77C2967B370002DBA6F /* KMDynamicStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E7782967B370002DBA6F /* KMDynamicStampViewController.xib */; };
 		89E4E77D2967B370002DBA6F /* KMDynamicStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E7782967B370002DBA6F /* KMDynamicStampViewController.xib */; };
 		89E4E77E2967B370002DBA6F /* KMDynamicStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E7782967B370002DBA6F /* KMDynamicStampViewController.xib */; };
@@ -871,6 +865,15 @@
 		9FB220DA2B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FB220D62B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib */; };
 		9FB220DB2B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FB220D62B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib */; };
 		9FB220DC2B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FB220D62B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib */; };
+		9FB220DF2B10850400A5B208 /* KMAnnotationStampViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FB220DD2B10850400A5B208 /* KMAnnotationStampViewController.swift */; };
+		9FB220E02B10850400A5B208 /* KMAnnotationStampViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FB220DD2B10850400A5B208 /* KMAnnotationStampViewController.swift */; };
+		9FB220E12B10850400A5B208 /* KMAnnotationStampViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FB220DD2B10850400A5B208 /* KMAnnotationStampViewController.swift */; };
+		9FB220E22B10850400A5B208 /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FB220DE2B10850400A5B208 /* KMAnnotationStampViewController.xib */; };
+		9FB220E32B10850400A5B208 /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FB220DE2B10850400A5B208 /* KMAnnotationStampViewController.xib */; };
+		9FB220E42B10850400A5B208 /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FB220DE2B10850400A5B208 /* KMAnnotationStampViewController.xib */; };
+		9FB220EC2B185B3100A5B208 /* KMButtomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FB220EB2B185B3100A5B208 /* KMButtomCell.swift */; };
+		9FB220ED2B185B3100A5B208 /* KMButtomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FB220EB2B185B3100A5B208 /* KMButtomCell.swift */; };
+		9FB220EE2B185B3100A5B208 /* KMButtomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FB220EB2B185B3100A5B208 /* KMButtomCell.swift */; };
 		9FBA0EE128FEC253001117AF /* KMProductPromotionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBA0EDF28FEC253001117AF /* KMProductPromotionViewController.swift */; };
 		9FBA0EE228FEC253001117AF /* KMProductPromotionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBA0EDF28FEC253001117AF /* KMProductPromotionViewController.swift */; };
 		9FBA0EE328FEC253001117AF /* KMProductPromotionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBA0EDF28FEC253001117AF /* KMProductPromotionViewController.swift */; };
@@ -4178,9 +4181,6 @@
 		89E4E73C2964160F002DBA6F /* KMAnnotationLinkViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMAnnotationLinkViewController.xib; sourceTree = "<group>"; };
 		89E4E753296427E5002DBA6F /* NSImage_SKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSImage_SKExtensions.m; sourceTree = "<group>"; };
 		89E4E754296427E5002DBA6F /* NSImage_SKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSImage_SKExtensions.h; sourceTree = "<group>"; };
-		89E4E75E29656A88002DBA6F /* KMAnnotationStampViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMAnnotationStampViewController.m; sourceTree = "<group>"; };
-		89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMAnnotationStampViewController.xib; sourceTree = "<group>"; };
-		89E4E76029656A88002DBA6F /* KMAnnotationStampViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMAnnotationStampViewController.h; sourceTree = "<group>"; };
 		89E4E7782967B370002DBA6F /* KMDynamicStampViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMDynamicStampViewController.xib; sourceTree = "<group>"; };
 		89E4E77F2967BF5A002DBA6F /* KMCustomizeStampViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMCustomizeStampViewController.h; sourceTree = "<group>"; };
 		89E4E7802967BF5A002DBA6F /* KMCustomizeStampViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMCustomizeStampViewController.m; sourceTree = "<group>"; };
@@ -4449,6 +4449,9 @@
 		9FAAA33D290FECA70046FFCE /* NSImage+QuickLook.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSImage+QuickLook.swift"; sourceTree = "<group>"; };
 		9FB220D52B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAnnotationSelectLinkViewController.swift; sourceTree = "<group>"; };
 		9FB220D62B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMAnnotationSelectLinkViewController.xib; sourceTree = "<group>"; };
+		9FB220DD2B10850400A5B208 /* KMAnnotationStampViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAnnotationStampViewController.swift; sourceTree = "<group>"; };
+		9FB220DE2B10850400A5B208 /* KMAnnotationStampViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMAnnotationStampViewController.xib; sourceTree = "<group>"; };
+		9FB220EB2B185B3100A5B208 /* KMButtomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMButtomCell.swift; sourceTree = "<group>"; };
 		9FBA0EDF28FEC253001117AF /* KMProductPromotionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMProductPromotionViewController.swift; sourceTree = "<group>"; };
 		9FBA0EE028FEC253001117AF /* KMProductPromotionViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMProductPromotionViewController.xib; sourceTree = "<group>"; };
 		9FBA0EE828FFC2FE001117AF /* Image.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Image.xcassets; sourceTree = "<group>"; };
@@ -6126,15 +6129,14 @@
 			isa = PBXGroup;
 			children = (
 				BBF19E8D2B0B301F007154C8 /* CreateStamp */,
-				89E4E76029656A88002DBA6F /* KMAnnotationStampViewController.h */,
-				89E4E75E29656A88002DBA6F /* KMAnnotationStampViewController.m */,
-				89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */,
 				AD5999412AD8DC2000412F8B /* KMDynamicStampViewController.swift */,
 				89E4E7782967B370002DBA6F /* KMDynamicStampViewController.xib */,
 				89E4E77F2967BF5A002DBA6F /* KMCustomizeStampViewController.h */,
 				89E4E7802967BF5A002DBA6F /* KMCustomizeStampViewController.m */,
 				89E4E7812967BF5A002DBA6F /* KMCustomizeStampViewController.xib */,
 				AD59993D2AD7E88600412F8B /* KMStampManager.swift */,
+				9FB220DD2B10850400A5B208 /* KMAnnotationStampViewController.swift */,
+				9FB220DE2B10850400A5B208 /* KMAnnotationStampViewController.xib */,
 			);
 			path = StampList;
 			sourceTree = "<group>";
@@ -10100,6 +10102,7 @@
 			isa = PBXGroup;
 			children = (
 				BBF19E982B0B3218007154C8 /* KMAnnotationStamp.swift */,
+				9FB220EB2B185B3100A5B208 /* KMButtomCell.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -10822,6 +10825,7 @@
 				ADAFD9F72AE68A8500F084BC /* KMCreatPDFView.xib in Resources */,
 				89E4E77C2967B370002DBA6F /* KMDynamicStampViewController.xib in Resources */,
 				89316855296E45CA0073EA59 /* KMImageAccessoryController.xib in Resources */,
+				9FB220E22B10850400A5B208 /* KMAnnotationStampViewController.xib in Resources */,
 				ADAFDA6C2AEB470200F084BC /* KMQucikToolsView.xib in Resources */,
 				896DD4582985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.xib in Resources */,
 				ADE86AA02B031FDB00414DFA /* KMCompareWindowController.xib in Resources */,
@@ -11044,7 +11048,6 @@
 				ADC31FAC2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */,
 				BB6BA4C82B0B4A4200462CAE /* KMLeftSideEmptyFileViewController.xib in Resources */,
 				ADD1B6F82946C0CA00C3FFF7 /* KMPrintChoosePageSizeMultipageView.xib in Resources */,
-				89E4E76429656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */,
 				BBC745ED295F067B0072C2ED /* KMCropSettingWindowController.xib in Resources */,
 				AD3AAD162B0B5B2700DE5FE7 /* KMCompareContentWindowController.xib in Resources */,
 				9F02016D2A1B088700C9B673 /* KMAIOpenPDFFilesVC.xib in Resources */,
@@ -11243,7 +11246,6 @@
 				AD85D1BE2AF0D2DD000F4D28 /* KMHomeQuickToolsCollectionView.xib in Resources */,
 				BB03D6A12B024AC8008C9976 /* KMPDFEditInsertPageWindow.xib in Resources */,
 				BBA19F3729ADACC5001A285A /* signPicture_nor.pdf in Resources */,
-				89E4E76529656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */,
 				ADE3C1E829A5ABC200793B13 /* KMLoginWindowController.xib in Resources */,
 				BB49ED02293F459500C82CA2 /* KMConvertPPTsWindowController.xib in Resources */,
 				AD3AAD312B0B700500DE5FE7 /* KMCompareCoveringView.xib in Resources */,
@@ -11306,6 +11308,7 @@
 				9F0CB4632966C9E200007028 /* KMFormPropertPanelViewController.xib in Resources */,
 				ADB2D6FE294882B70029D2B3 /* KMTextFieldStepperView.xib in Resources */,
 				9F221ED329A85D3700978A59 /* KMDesignBase.xib in Resources */,
+				9FB220E32B10850400A5B208 /* KMAnnotationStampViewController.xib in Resources */,
 				ADB2D6EA294740F30029D2B3 /* KMPrintPaperSetWindowController.xib in Resources */,
 				AD867FB829DFBB3200F00440 /* KMAnnotationOutlineCellView.xib in Resources */,
 				AD1CA4252A061D190070541F /* KMAnnotationScreenAuthorViewItem.xib in Resources */,
@@ -11569,6 +11572,7 @@
 				AD0FA51029A9E75000EDEB50 /* KMLoginInputPasswordView.xib in Resources */,
 				ADBC372F29CA951E00D93208 /* KMComparativeOutlineView.xib in Resources */,
 				9F00CCBC2A2F1E0F00AC462E /* dsa_pub.pem in Resources */,
+				9FB220E42B10850400A5B208 /* KMAnnotationStampViewController.xib in Resources */,
 				9F3D818C29A0A9A70087B5AD /* KMDesignButton.xib in Resources */,
 				BB89724B294C19980045787C /* KMWatermarkAdjectiveListController.xib in Resources */,
 				BBA2109229ACBFDB00E6B346 /* nosign.pdf in Resources */,
@@ -11676,7 +11680,6 @@
 				BBC348192955920B008D2CD1 /* KMBackgroundPropertyController.xib in Resources */,
 				9F02019B2A1F352100C9B673 /* KMAITranslationConfirmWindowController.xib in Resources */,
 				AD6260702A9D968B006C6413 /* KMEditPDFAssets.xcassets in Resources */,
-				89E4E76629656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */,
 				899700E428F3A9F2009AF911 /* KMHomeWindowController.xib in Resources */,
 				BBC348402955A60B008D2CD1 /* KMBackgroundPropertyInfoController.xib in Resources */,
 				9F0201832A1BAC1600C9B673 /* KMAIRewritingVC.xib in Resources */,
@@ -12341,7 +12344,6 @@
 				BB5BE4ED2B060E2100D51BF2 /* KMLanguageViewController.swift in Sources */,
 				BBEFD01C2AF9E5AA003FABD8 /* KMBatchOperateAddHeaderFooterViewController.swift in Sources */,
 				9F3D818E29A22AD90087B5AD /* Date+KMExtensions.swift in Sources */,
-				89E4E76129656A88002DBA6F /* KMAnnotationStampViewController.m in Sources */,
 				89E4E755296427E5002DBA6F /* NSImage_SKExtensions.m in Sources */,
 				BB4A94A02B04D8EC00940F8B /* KMGOCRManager.m in Sources */,
 				BB6DD821293497B6001F0544 /* KMSecureEncryptModel.swift in Sources */,
@@ -12670,6 +12672,7 @@
 				9F1FE4C029406E4700E952CA /* NSWindow+CTThemed.m in Sources */,
 				BB853CAA2AF8FA46009C20C1 /* KMHeaderFooterManagerWindowController.swift in Sources */,
 				9F0CB48729683DC400007028 /* KMPropertiesPanelPresetColorSubVC.swift in Sources */,
+				9FB220DF2B10850400A5B208 /* KMAnnotationStampViewController.swift in Sources */,
 				9F1FE50229406E4700E952CA /* CTTabStripModelOrderController.m in Sources */,
 				BB49ECFE293F459500C82CA2 /* KMConvertPPTsWindowController.swift in Sources */,
 				BB9E2F732A495BCD000DC68D /* KMConvertSettingLimitTipView.swift in Sources */,
@@ -12785,6 +12788,7 @@
 				BBEC00CC295C31F900A26C98 /* KMBatesModel.swift in Sources */,
 				AD0E8AB92A31BDDD00DBFD3C /* KMProduct.swift in Sources */,
 				BB403BAA2B15CA6E00B3106D /* KMBatchConvertOperation.swift in Sources */,
+				9FB220EC2B185B3100A5B208 /* KMButtomCell.swift in Sources */,
 				9F1FE4C929406E4700E952CA /* CTTabContents.m in Sources */,
 				9FCFEC882AD0EF9900EAD2CB /* KMPopMenuButton.swift in Sources */,
 				9F39B9442A661ED500930ACA /* KMHomeScrollView.swift in Sources */,
@@ -12932,6 +12936,7 @@
 				BB146FBE299DC0D100784A6A /* GTMGatherInputStream.m in Sources */,
 				9F1F82EF293609F60092C4B4 /* CPDFDocument+PageEditManager.swift in Sources */,
 				BB8F4583295B0F900037EA22 /* KMHeaderFooterMarginInfoView.swift in Sources */,
+				9FB220ED2B185B3100A5B208 /* KMButtomCell.swift in Sources */,
 				9F1FE51229407B4000E952CA /* KMFileSearchView.swift in Sources */,
 				BB14702A299DC0D100784A6A /* OIDAuthorizationService.m in Sources */,
 				9FF94F1229A7476000B1EF69 /* KMDesignPropertySelector.swift in Sources */,
@@ -12943,6 +12948,7 @@
 				BB14700C299DC0D100784A6A /* OIDAuthorizationRequest.m in Sources */,
 				ADE3C1DF29A5AA0B00793B13 /* KMRequestServer.swift in Sources */,
 				BB46CF4D2AFBB34900281EDF /* AutoSaveManager.swift in Sources */,
+				9FB220E02B10850400A5B208 /* KMAnnotationStampViewController.swift in Sources */,
 				BB3A66A42B0783BD00575343 /* KMTocTableCellView.swift in Sources */,
 				BBA00AC52B157C880043D903 /* KMToolbarZoomItemView.swift in Sources */,
 				BBC3484B2958222C008D2CD1 /* KMBackgroundOutsideView.swift in Sources */,
@@ -13274,7 +13280,6 @@
 				BBD1F794296FE92500343885 /* KMPageEditSplitSettingView.swift in Sources */,
 				899700FF28F40710009AF911 /* KMBookMarkViewController.swift in Sources */,
 				9F3D818F29A22AD90087B5AD /* Date+KMExtensions.swift in Sources */,
-				89E4E76229656A88002DBA6F /* KMAnnotationStampViewController.m in Sources */,
 				89E4E756296427E5002DBA6F /* NSImage_SKExtensions.m in Sources */,
 				BBD512A22B0DE86C005BFE8A /* KMBotaLeftView.swift in Sources */,
 				AD1D481A2AFB6B96007AC1F0 /* KMMergeWindowController.swift in Sources */,
@@ -13992,6 +13997,7 @@
 				9FDD0F71294AD13C000C4DAD /* KMMainViewController+Action.swift in Sources */,
 				ADF1569529A62D1D001D1018 /* KMLoginLeftImageView.swift in Sources */,
 				9F1F82E52934D5240092C4B4 /* KMHomeExtractActionViewController.swift in Sources */,
+				9FB220E12B10850400A5B208 /* KMAnnotationStampViewController.swift in Sources */,
 				ADBC375F29CC61E100D93208 /* KMReadModelView.swift in Sources */,
 				AD867F8829D94F5100F00440 /* KMBOTAOutlineView.swift in Sources */,
 				BB146FEF299DC0D100784A6A /* GTLRBatchResult.m in Sources */,
@@ -14110,7 +14116,6 @@
 				BB2F184C2A0C911B0003F65E /* KMBaseWindowController.swift in Sources */,
 				AD1D48112AFB1907007AC1F0 /* KMCompressView.swift in Sources */,
 				BBA93D2F29BEBAA60044E0DD /* KMPreferenceEnum.swift in Sources */,
-				89E4E76329656A88002DBA6F /* KMAnnotationStampViewController.m in Sources */,
 				BB89726B294DB41D0045787C /* KMWatermarkAdjectivePositionView.swift in Sources */,
 				BBA19F4929AE27DB001A285A /* KMAnnotationTableRowView.swift in Sources */,
 				F37322EF292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.m in Sources */,
@@ -14428,6 +14433,7 @@
 				9F0CB4FB298655E500007028 /* KMDesignToken+Border.swift in Sources */,
 				BBBF68822A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */,
 				9F0CB4D32986550B00007028 /* KMDesignToken+Width.swift in Sources */,
+				9FB220EE2B185B3100A5B208 /* KMButtomCell.swift in Sources */,
 				BB4EEF4629764FEF003A3537 /* KMWatermarkAligementView.swift in Sources */,
 				9FF816F52AFB18290087EFC5 /* NSGeometry_KMExtensions.swift in Sources */,
 				9F0CB533298656EA00007028 /* KMDesignToken+BorderWidthBottom.swift in Sources */,

+ 0 - 78
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanwj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -292,84 +292,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C153658E-EE27-4BB7-A793-68BA56D7700E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "141"
-            endingLineNumber = "141"
-            landmarkName = "-reloadDataSignaturesIsSelectLast:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "C153658E-EE27-4BB7-A793-68BA56D7700E - d9457e82a77e2369"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[KMSignatureAnnotationViewController reloadDataSignaturesIsSelectLast:]"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanwj/Git/Mac/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "141"
-                  endingLineNumber = "141"
-                  offsetFromSymbolStart = "500">
-               </Location>
-               <Location
-                  uuid = "C153658E-EE27-4BB7-A793-68BA56D7700E - d9457e82a77e2369"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[KMSignatureAnnotationViewController reloadDataSignaturesIsSelectLast:]"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanwj/Git/Mac/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "141"
-                  endingLineNumber = "141"
-                  offsetFromSymbolStart = "580">
-               </Location>
-               <Location
-                  uuid = "C153658E-EE27-4BB7-A793-68BA56D7700E - d9457e82a77e2388"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[KMSignatureAnnotationViewController reloadDataSignaturesIsSelectLast:]"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanwj/Git/Mac/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "142"
-                  endingLineNumber = "142"
-                  offsetFromSymbolStart = "688">
-               </Location>
-               <Location
-                  uuid = "C153658E-EE27-4BB7-A793-68BA56D7700E - d9457e82a77e2369"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[KMSignatureAnnotationViewController reloadDataSignaturesIsSelectLast:]"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanwj/Git/Mac/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "141"
-                  endingLineNumber = "141"
-                  offsetFromSymbolStart = "688">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent

+ 13 - 8
PDF Office/PDF Master/Class/Batch/WindowController/PasswordWindowController.swift

@@ -80,14 +80,19 @@ protocol PasswordWindowDelegate: AnyObject {
             handler(password ?? "")
         }
     }
-//    func beginSheetModalForWindow(_ window: NSWindow, completionHandler handler: ((String) -> Void)?) {
-////        self.window?.beginSheet(window)
-//        NSApp.beginSheet(self.window!,
-//                         modalFor: window,
-//                         modalDelegate: self,
-//                         didEnd: #selector(didEndSheet(_:returnCode:contextInfo:)),
-//                         contextInfo: handler != nil ? handler : nil)
-//    }
+
+    func beginSheetModal(for window: NSWindow, completionHandler handler: ((String) -> Void)?) {
+        struct Context {
+            var handler: ((String) -> Void)?
+        }
+        
+        var context = Context(handler: handler)
+        
+        // Pass the address of the struct as contextInfo
+        let contextPointer = UnsafeMutableRawPointer(&context)
+        NSApp.beginSheet(self.window!, modalFor: window, modalDelegate: self, didEnd: #selector(didEndSheet(_:returnCode:contextInfo:)), contextInfo: contextPointer)
+    }
+
     
     override func close() {
         if (self.closeCallBack != nil) {

+ 6 - 0
PDF Office/PDF Master/Class/Home/Category/String+KMExtensions.swift

@@ -39,6 +39,12 @@ extension String {
         }
     }
     
+    var pathExtension:String {
+        get {
+            return fileURL.pathExtension
+        }
+    }
+    
     var deletingPathExtension: String {
         return fileURL.deletingPathExtension().path
     }

+ 2 - 1
PDF Office/PDF Master/Class/Home/WindowController/KMURLToPDFWindowController/KMURLToPDFWindowController.swift

@@ -131,7 +131,8 @@ class KMURLToPDFWindowController: NSWindowController, NSTextFieldDelegate {
     }
 
     @IBAction func buttonItemClicked_Cancel(_ sender: NSButton) {
-        self.window?.endSheet(NSWindow.currentWindow())
+        NSWindow.currentWindow().endSheet(self.window!)
+        self.window?.orderOut(self)
     }
 
     func urlValueEncode(_ str: String) -> String? {

+ 9 - 0
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotation+PDFListView.swift

@@ -126,6 +126,15 @@ import Foundation
         }
         return ""
     }
+    
+    func registerUserName() -> Void {
+        let userName = UserDefaults.standard.string(forKey: "SKUserName") ?? ""
+        setUserName(userName)
+        
+        if !UserDefaults.standard.bool(forKey: "SKDisableModificationDate") {
+            setModificationDate(Date())
+        }
+    }
 }
 
 @objc extension CPDFAnnotation {

+ 12 - 0
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFInkAnnotation+PDFListView.swift

@@ -8,6 +8,18 @@
 import Foundation
 
 @objc extension CPDFInkAnnotation {
+    convenience init(KMNoteBounds bounds: NSRect) {
+        self.init(KMNoteBounds: bounds)
+        if let inkNoteColor = UserDefaults.standard.color(forKey: "SKInkNoteColorKey") {
+            color = inkNoteColor
+        }
+        
+        let lineWidth = CGFloat(UserDefaults.standard.float(forKey: "SKInkNoteLineWidthKey"))
+        let dashPattern = UserDefaults.standard.array(forKey: "SKInkNoteDashPatternKey") as? [NSNumber]
+        let style = CPDFBorderStyle(rawValue: Int(UserDefaults.standard.float(forKey: "SKInkNoteLineStyleKey"))) ?? .solid
+        let border = CPDFBorder(style: style, lineWidth: lineWidth, dashPattern: dashPattern)
+    }
+    
     convenience init(PDFListViewNoteWith document: CPDFDocument) {
         self.init(document: document)
         if let model = CPDFAnnotationModel(annotationType: .ink) {

+ 5 - 0
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.h

@@ -145,6 +145,11 @@ typedef NS_ENUM(NSInteger, CToolMode) {
 @property (nonatomic, strong) CAShapeLayer *shapeLayerTopH;
 @property (nonatomic, strong) CAShapeLayer *shapeLayerBottomH;
 
+@property (nonatomic,assign) NSPoint lastAddAnnotationPoint;
+
+@property (nonatomic, assign) BOOL isCreatAnnotation;
+@property (nonatomic, assign) NSInteger toolBarCreateAnnotationMenuItem;
+
 - (CPDFAnnotation *)addAnnotationWithType:(CAnnotationType)annotationType selection:(CPDFSelection *)selection page:(CPDFPage *)page bounds:(NSRect)bounds;
 
 // Add stamp Annotation, add directly after mouse click

+ 11 - 0
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Extension.h

@@ -12,6 +12,7 @@
 
 #import "CPDFListView.h"
 
+@class KMAnnotationStamp, KMSignature;
 @interface CPDFListView (Extension)
 
 - (void)setSpellingTag:(NSInteger)spellingTag;
@@ -21,6 +22,16 @@
 
 - (CPDFAnnotation *)addPDFStampAnotationWithPagePoint:(CGPoint)pagePoint withPage:(CPDFPage *)page;
 
+- (void)addAnnotationWithStamp:(KMAnnotationStamp *)stamp;
+
+- (void)addAnnotationWithSignature:(KMSignature *)signature;
+
+- (void)rotateLeftForStampAnnotation:(KMAnnotationStamp *)annotation;
+
+- (void)rotateRightForStampAnnotation:(KMAnnotationStamp *)annotation;
+
+- (void)setStampAnnotation:(KMAnnotationStamp *)annotation forImageAlpha:(CGFloat)alpha;
+
 - (BOOL)canCopy;
 - (BOOL)canPaste;
 

+ 236 - 0
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Extension.m

@@ -102,6 +102,242 @@
     return annotation;
 }
 
+- (void)addAnnotationWithStamp:(KMAnnotationStamp *)stamp {
+    // First try the current mouse position
+    NSPoint center = [self convertPoint:[[self window] mouseLocationOutsideOfEventStream] fromView:nil];
+    [self addAnnotationWithStamp:stamp center:center];
+}
+
+- (void)addAnnotationWithStamp:(KMAnnotationStamp *)stamp center:(NSPoint)center {
+    [self setToolMode:CTextToolMode];
+    CPDFPage *page = nil;
+    NSRect bounds = NSZeroRect;
+    CPDFSelection *selection = [self currentSelection];
+    page = [selection safeFirstPage];
+    
+    // if the mouse was in the toolbar and there is a page below the toolbar, we get a point outside of the visible rect
+    page = NSMouseInRect(center, [self visibleContentRect], [self isFlipped]) ? [self pageForPoint:center nearest:NO] : nil;
+    
+    if (page == nil) {
+        // Get center of the PDFView.
+        NSRect viewFrame = [self frame];
+        center = NSMakePoint(NSMidX(viewFrame), NSMidY(viewFrame));
+        page = [self pageForPoint: center nearest: YES];
+        if (page == nil) {
+            // Get center of the current page
+            page = [self currentPage];
+            center = [self convertPoint:NSMakePoint(NSMidX([page boundsForBox:[self displayBox]]), NSMidY([page boundsForBox:[self displayBox]])) fromPage:page];
+        }
+    }
+    
+    CGFloat defaultWidth = 160;
+    CGFloat defaultHeight = 40;
+    if (stamp.isCustomImageStamp) {
+        defaultWidth = 360;
+        defaultHeight = 90;
+    }
+    NSSize defaultSize = ([page rotation] % 180 == 0) ? NSMakeSize(defaultWidth, defaultHeight) : NSMakeSize(defaultHeight, defaultWidth);
+
+    // Convert to "page space".
+    center = NSMakePoint(round([self convertPoint: center toPage: page].x), round([self convertPoint: center toPage: page].y));
+    bounds = NSMakeRect(center.x - 0.5 * defaultSize.width, center.y - 0.5 * defaultSize.height, defaultSize.width, defaultSize.height);
+    
+    // Make sure it fits in the page
+    bounds = KMConstrainRect(bounds, [page boundsForBox:[self displayBox]]);
+    
+    if (page != nil) {
+        BOOL isInitial = NSEqualSizes(bounds.size, NSZeroSize) && selection == nil;
+        NSRect pageBounds = [page boundsForBox:kPDFDisplayBoxMediaBox];
+
+        // new note added by note tool mode, don't add actual zero sized notes
+        if (isInitial)
+            bounds = NSMakeRect(center.x - 0.5 * 8.0, center.y - 0.5 * 8.0, 8.0, 8.0);
+
+        if(!CGPointEqualToPoint(self.lastAddAnnotationPoint, CGPointZero)) {
+            bounds.origin.x = self.lastAddAnnotationPoint.x + 3.0;
+            bounds.origin.y = self.lastAddAnnotationPoint.y - 3.0;
+            CGFloat pageWidth = pageBounds.size.width;
+            
+            if (bounds.origin.x + bounds.size.width >pageWidth) {
+                bounds.origin.x = pageWidth - bounds.size.width;
+            }
+            if (bounds.origin.y - bounds.size.height < 0) {
+                bounds.origin.y = bounds.size.height;
+            }
+        }
+        
+        self.lastAddAnnotationPoint = bounds.origin;
+        
+//        KMAnnotationStamp *newAnnotation = [[KMAnnotationStamp alloc] initSkimNoteWithBounds:bounds];
+        KMAnnotationStamp *newAnnotation = [[KMAnnotationStamp alloc] initWithBounds:bounds];
+        if (stamp.needExchangeFontSize) {
+            newAnnotation.needExchangeFontSize = YES;
+        }
+        
+        if (stamp.isStandardStamp) {
+//            newAnnotation.customStampType = [stamp stampType];
+        } else if (stamp.isCustomImageStamp) {
+            newAnnotation.image = stamp.image;
+        } else {
+//            [newAnnotation setStampColor:stamp.stampColor];
+            //CONFIDENTIAL 添加显示不全,这里特殊处理
+            if([stamp.dateString isEqualToString:@"CONFIDENTIAL"] && !stamp.string) {
+                [newAnnotation setCustomStampString:stamp.dateString dateString:stamp.string];
+            } else {
+                [newAnnotation setCustomStampString:stamp.string dateString:stamp.dateString];
+            }
+        }
+        
+//        [newAnnotation registerUserName];
+        [self addAnnotation:newAnnotation toPage:page];
+        [[self undoManager] setActionName:NSLocalizedString(@"Add Note", @"Undo action name")];
+        
+//        [self setActiveAnnotation:newAnnotation];
+        self.isCreatAnnotation = NO;
+    }
+    else NSBeep();
+}
+
+- (void)addAnnotationWithSignature:(KMSignature *)signature {
+    // First try the current mouse position
+    NSPoint center = [self convertPoint:[[self window] mouseLocationOutsideOfEventStream] fromView:nil];
+    [self addAnnotationWithSignature:signature center:center];
+}
+
+- (void)addAnnotationWithSignature:(KMSignature *)signature center:(NSPoint)center {
+    [self setToolMode:CTextToolMode];
+    CPDFPage *page = nil;
+    NSRect bounds = NSZeroRect;
+    CPDFSelection *selection = [self currentSelection];
+    page = [selection safeFirstPage];
+    
+    // if the mouse was in the toolbar and there is a page below the toolbar, we get a point outside of the visible rect
+    page = NSMouseInRect(center, [self visibleContentRect], [self isFlipped]) ? [self pageForPoint:center nearest:NO] : nil;
+    
+    if (page == nil) {
+        // Get center of the PDFView.
+        NSRect viewFrame = [self frame];
+        center = NSMakePoint(NSMidX(viewFrame), NSMidY(viewFrame));
+        page = [self pageForPoint: center nearest: YES];
+        if (page == nil) {
+            // Get center of the current page
+            page = [self currentPage];
+            center = [self convertPoint:NSMakePoint(NSMidX([page boundsForBox:[self displayBox]]), NSMidY([page boundsForBox:[self displayBox]])) fromPage:page];
+        }
+    }
+    
+    CGFloat defaultWidth = signature.pathsImage.size.width;
+    CGFloat defaultHeight = signature.pathsImage.size.height;
+    NSSize defaultSize = ([page rotation] % 180 == 0) ? NSMakeSize(defaultWidth, defaultHeight) : NSMakeSize(defaultHeight, defaultWidth);
+
+    // Convert to "page space".
+    center = NSMakePoint(round([self convertPoint: center toPage: page].x), round([self convertPoint: center toPage: page].y));
+    bounds = NSMakeRect(center.x - 0.5 * defaultSize.width, center.y - 0.5 * defaultSize.height, defaultSize.width, defaultSize.height);
+
+    // Make sure it fits in the page
+    bounds = KMConstrainRect(bounds, [page boundsForBox:[self displayBox]]);
+    
+    if (page != nil) {
+        NSRect pageBounds = [page boundsForBox:CPDFDisplayMediaBox];
+
+        BOOL isInitial = NSEqualSizes(bounds.size, NSZeroSize) && selection == nil;
+        
+        // new note added by note tool mode, don't add actual zero sized notes
+        if (isInitial)
+            bounds = CPDFListViewRectFromCenterAndSquareSize(bounds.origin, 8.0);
+
+        if(!CGPointEqualToPoint(self.lastAddAnnotationPoint, CGPointZero)) {
+            bounds.origin.x = self.lastAddAnnotationPoint.x + 3.0;
+            bounds.origin.y = self.lastAddAnnotationPoint.y - 3;
+            CGFloat pageWidth = pageBounds.size.width;
+            
+            if (bounds.origin.x + bounds.size.width >pageWidth) {
+                bounds.origin.x = pageWidth - bounds.size.width;
+            }
+            if (bounds.origin.y - bounds.size.height < 0) {
+                bounds.origin.y = bounds.size.height;
+            }
+        }
+        self.lastAddAnnotationPoint = bounds.origin;
+
+        if (KMPDFSignatureTypeText == signature.signatureType) {
+            KMAnnotationStamp *annotation = [[KMAnnotationStamp alloc] initWithBounds:bounds];
+            annotation.image = signature.pathsImage;
+            NSDate *date = [NSDate date];
+            annotation.modificationDate = date;
+            [annotation registerUserName];
+            [self addAnnotation:annotation toPage:page];
+//            [self setActiveAnnotation:annotation];
+        } else if (KMPDFSignatureTypeImage == signature.signatureType) {
+            KMAnnotationStamp *annotation = [[KMAnnotationStamp alloc] initWithBounds:bounds];
+            annotation.image = signature.pathsImage;
+            NSDate *date = [NSDate date];
+            annotation.modificationDate = date;
+            [annotation registerUserName];
+            [self addAnnotation:annotation toPage:page];
+//            [self setActiveAnnotation:annotation];
+        } else {
+            CPDFInkAnnotation *newAnnotation = [[CPDFInkAnnotation alloc] initWithKMNoteBounds:bounds];
+            NSBezierPath *path = [signature.paths objectAtIndex:0];
+            for(NSUInteger i=1; i<[signature.paths count]; i++){
+                NSBezierPath *path1 = [signature.paths objectAtIndex:i];
+                [path appendBezierPath:path1];
+            }
+            [newAnnotation addBezierPath:path];
+            CPDFBorder *border = [[CPDFBorder alloc] initWithStyle:newAnnotation.border.style lineWidth:[(NSBezierPath*)[signature.paths objectAtIndex:0] lineWidth] dashPattern:newAnnotation.border.dashPattern];
+            newAnnotation.border = border;
+            newAnnotation.color = [signature signatureColor];
+            
+            [newAnnotation registerUserName];
+            [self addAnnotation:newAnnotation toPage:page];
+//            [self setActiveAnnotation:newAnnotation];
+        }
+
+        [[self undoManager] setActionName:NSLocalizedString(@"Add Note", @"Undo action name")];
+    }
+    else NSBeep();
+}
+
+- (void)rotateLeftForStampAnnotation:(KMAnnotationStamp *)annotation {
+    NSInteger rotation = annotation.rotation;
+    if (rotation == 0) {
+        rotation = 270;
+    } else if (rotation == 90) {
+        rotation = 0;
+    } else if (rotation == 180) {
+        rotation = 90;
+    } else if (rotation == 270) {
+        rotation = 180;
+    }
+    annotation.rotation = rotation;
+    
+    [[[self undoManager] prepareWithInvocationTarget:self] rotateRightForStampAnnotation:annotation];
+}
+
+- (void)rotateRightForStampAnnotation:(KMAnnotationStamp *)annotation {
+    NSInteger rotation = annotation.rotation;
+    if (rotation == 0) {
+        rotation = 90;
+    } else if (rotation == 90) {
+        rotation = 180;
+    } else if (rotation == 180) {
+        rotation = 270;
+    } else if (rotation == 270) {
+        rotation = 0;
+    }
+    annotation.rotation = rotation;
+    
+    [[[self undoManager] prepareWithInvocationTarget:self] rotateLeftForStampAnnotation:annotation];
+}
+
+- (void)setStampAnnotation:(KMAnnotationStamp *)annotation forImageAlpha:(CGFloat)alpha {
+    [[[self undoManager] prepareWithInvocationTarget:self] setStampAnnotation:annotation forImageAlpha:annotation.imageAlpha];
+
+    annotation.imageAlpha = alpha;
+    annotation.bounds = annotation.bounds;
+    [self setNeedsDisplay:YES];
+}
+
 - (void)checkSpelling:(id)sender {
     CPDFSelection *selection = [self currentSelection];
     CPDFPage *page;

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

@@ -8,7 +8,6 @@
 #import "KMAnnotationPropertiesViewController.h"
 #import "KMGeneralAnnotationViewController.h"
 //#import "NSString_SKExtensions.h"
-#import "KMAnnotationStampViewController.h"
 #import <PDF_Master-Swift.h>
 #import "KMSignatureAnnotationViewController.h"
 #import "CSelfSignAnnotation.h"
@@ -545,11 +544,12 @@
         self.contentViewController = vc;
     } else if (annotationMode == CAnnotationTypeStamp) {
         self.titleViewHeightConstraint.constant = 0;
-        KMAnnotationStampViewController *vc = [[KMAnnotationStampViewController alloc] init];
-        vc.annotationModel = annotationModel;
-        vc.pdfView = self.pdfView;
-        self.propertiesBox.contentView = vc.view;
-        self.contentViewController = vc;
+//        KMAnnotationStampViewController *vc = [[KMAnnotationStampViewController alloc] init];
+//        vc.annotationModel = annotationModel;
+//        vc.pdfView = self.pdfView;
+//        vc.annotations =self.annotations;
+//        self.propertiesBox.contentView = vc.view;
+//        self.contentViewController = vc;
     } else if (annotationMode == CAnnotationTypeSignSignature) {
         KMSignatureAnnotationViewController *vc = [[KMSignatureAnnotationViewController alloc] init];
         self.titleViewHeightConstraint.constant = 0;
@@ -588,7 +588,7 @@
 //        self.contentViewController = vc;
       
     } else if (openPropertiesType == KMOpenPropertiesType_Stamp) {
-//        self.titleLabel.stringValue = NSLocalizedString(@"Stamp", nil);
+        self.titleLabel.stringValue = NSLocalizedString(@"Stamp", nil);
 //        KMAnnotationStampViewController *vc = [[KMAnnotationStampViewController alloc] init];
 //        vc.annotationModel = annotationModel;
 //        vc.pdfView = self.pdfView;
@@ -619,12 +619,12 @@
     if ([annotation isKindOfClass:[CPDFStampAnnotation class]]) {
         if (isContinuousAddStamp) {
             self.titleViewHeightConstraint.constant = 0;
-            KMAnnotationStampViewController *vc = [[KMAnnotationStampViewController alloc] init];
-            vc.annotationModel = annotationModel;
-            vc.pdfView = self.pdfView;
-            vc.isContinuousAddStamp = YES;
-            self.propertiesBox.contentView = vc.view;
-            self.contentViewController = vc;
+//            KMAnnotationStampViewController *vc = [[KMAnnotationStampViewController alloc] init];
+//            vc.annotationModel = annotationModel;
+//            vc.pdfView = self.pdfView;
+//            vc.isContinuousAddStamp = YES;
+//            self.propertiesBox.contentView = vc.view;
+//            self.contentViewController = vc;
         }
     } else if ([annotation isKindOfClass:[CPDFSignatureAnnotation class]]) {
         if (isContinuousAddStamp) {

+ 7 - 7
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/KMFormPropertPanelViewController.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMFormPropertPanelViewController" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMFormPropertPanelViewController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="actionBox" destination="hAo-ej-dYS" id="wOz-2a-wrE"/>
                 <outlet property="actionImageView" destination="b9q-3H-eRH" id="m0d-MQ-9mn"/>
@@ -40,7 +40,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="220" height="32"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
-                                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Yul-VA-i9G" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Yul-VA-i9G" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                                         <rect key="frame" x="2" y="2" width="54" height="28"/>
                                         <view key="contentView" id="jkk-fi-7ue">
                                             <rect key="frame" x="0.0" y="0.0" width="54" height="28"/>
@@ -62,7 +62,7 @@
                                             <constraint firstAttribute="width" constant="54" id="slK-fF-bPk"/>
                                         </constraints>
                                     </box>
-                                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="VfD-1U-FxE" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="VfD-1U-FxE" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                                         <rect key="frame" x="56" y="2" width="54" height="28"/>
                                         <view key="contentView" id="HqJ-Nh-DGi">
                                             <rect key="frame" x="0.0" y="0.0" width="54" height="28"/>
@@ -81,7 +81,7 @@
                                             </constraints>
                                         </view>
                                     </box>
-                                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="sau-qz-fza" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="sau-qz-fza" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                                         <rect key="frame" x="110" y="2" width="54" height="28"/>
                                         <view key="contentView" id="uds-Di-MGu">
                                             <rect key="frame" x="0.0" y="0.0" width="54" height="28"/>
@@ -100,7 +100,7 @@
                                             </constraints>
                                         </view>
                                     </box>
-                                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="hAo-ej-dYS" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                                    <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="hAo-ej-dYS" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                                         <rect key="frame" x="164" y="2" width="54" height="28"/>
                                         <view key="contentView" id="2Th-ZA-kl9">
                                             <rect key="frame" x="0.0" y="0.0" width="54" height="28"/>

+ 14 - 0
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/CreateStamp/Controller/KMStampCreaterWindowController.swift

@@ -101,6 +101,7 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         self.dateButton.state = .off
         self.timeButton.state = .off
     }
+    
     func changeBoardView(bounds: CGRect) {
         if boardView == nil {
             boardView = NSView()
@@ -112,6 +113,19 @@ class KMStampCreaterWindowController: NSWindowController, NSTextViewDelegate{
         }
         boardView.frame = NSRect(x: bounds.origin.x - 4, y: bounds.origin.y - 4, width: bounds.size.width + 8, height: bounds.size.height + 8)
     }
+    
+    func beginSheetModal(for window: NSWindow, completionHandler handler: ((Int) -> Void)?) {
+        struct Context {
+            var handler: ((Int) -> Void)?
+        }
+        
+        var context = Context(handler: handler)
+        
+        // Pass the address of the struct as contextInfo
+        let contextPointer = UnsafeMutableRawPointer(&context)
+        NSApp.beginSheet(self.window!, modalFor: window, modalDelegate: self, didEnd: #selector(dismissSheet(_:)), contextInfo: contextPointer)
+    }
+    
     @IBAction func colorButton_Click(_ sender: NSButton) {
         changeBoardView(bounds: sender.frame)
         self.stamp?.bounds = self.preView.bounds

+ 2 - 2
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/CreateStamp/View/KMAnnotationStamp.swift

@@ -61,7 +61,7 @@ let StampStringEdgeSizeScale = 0.1
     case Normal
 }
 
-class KMAnnotationStamp: CPDFStampAnnotation{
+@objcMembers class KMAnnotationStamp: CPDFStampAnnotation {
     var isStandardStamp: Bool = false
     var isCustomImageStamp: Bool = false
     var needExchangeFontSize: Bool = false
@@ -75,7 +75,7 @@ class KMAnnotationStamp: CPDFStampAnnotation{
     var borderDefaultWidth: Float = 0
     var borderScale: Float = 0
     var borderBounds: NSRect?
-    
+    var type1: KMAnnotationStampType?
     var customStampType: KMAnnotationStampType? {
         willSet{
             

+ 37 - 0
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/CreateStamp/View/KMButtomCell.swift

@@ -0,0 +1,37 @@
+//
+//  KMButtomCell.swift
+//  PDF Master
+//
+//  Created by wanjun on 2023/11/30.
+//
+
+import Cocoa
+
+class KMButtomCell: NSButtonCell {
+    override func drawImage(_ image: NSImage, withFrame frame: NSRect, in controlView: NSView) {
+        let titleSize = self.attributedTitle.size()
+        let imageSize = self.image?.size ?? NSSize(width: 0, height: 0)
+        let totalWidth = titleSize.width + imageSize.width + 8
+        
+        var rect = NSZeroRect
+        let leftGap = (controlView.bounds.size.width - totalWidth) / 2.0
+        rect.origin.x = leftGap
+        let topGap = (controlView.frame.size.height - imageSize.height) / 2.0
+        rect.origin.y = topGap
+        rect.size = imageSize
+        super.drawImage(self.image!, withFrame: rect, in: controlView)
+    }
+    
+    override func drawTitle(_ title: NSAttributedString, withFrame frame: NSRect, in controlView: NSView) -> NSRect {
+        let titleSize = self.attributedTitle.size()
+        let imageSize = self.image?.size ?? NSSize(width: 0, height: 0)
+        let totalWidth = titleSize.width + imageSize.width + 8
+        
+        var rect = NSZeroRect
+        let leftGap = (controlView.bounds.size.width - totalWidth) / 2.0 + imageSize.width + 4.0
+        rect.origin.x = leftGap
+        rect.origin.y = (controlView.bounds.size.height - titleSize.height) / 2.0
+        rect.size = titleSize
+        return super.drawTitle(title, withFrame: rect, in: controlView)
+    }
+}

+ 0 - 24
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.h

@@ -1,24 +0,0 @@
-//
-//  KMAnnotationStampViewController.h
-//  SignFlow
-//
-//  Created by lxy on 2021/5/20.
-//
-
-#import <Cocoa/Cocoa.h>
-#import "CPDFListView.h"
-#import "CPDFAnnotationModel.h"
-
-@interface KMAnnotationStampViewController : NSViewController
-
-@property (nonatomic,strong) CPDFAnnotationModel *annotationModel;
-
-@property (nonatomic,strong) CPDFListView *pdfView;
-
-@property (nonatomic,assign) BOOL isClickSignatureList;
-
-@property (nonatomic, assign) BOOL isContinuousAddStamp;
-
-@end
-
-

+ 0 - 473
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.m

@@ -1,473 +0,0 @@
-//
-//  KMAnnotationStampViewController.m
-//  SignFlow
-//
-//  Created by lxy on 2023/1/04.
-//
-
-#import "KMAnnotationStampViewController.h"
-#import "KMCustomizeStampViewController.h"
-#import <PDF_Master-Swift.h>
-
-#pragma mark - KMStampTableRowView
-
-@interface KMStampTableRowView : NSTableRowView
-
-@end
-
-@implementation KMStampTableRowView
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        [self addTrackingArea];
-    }
-    return self;
-}
-
-- (void)addTrackingArea {
-    NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:self.bounds options:NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingActiveAlways |NSTrackingMouseMoved owner:self userInfo:nil];
-    [self addTrackingArea:trackingArea];
-}
-
-- (void)drawSelectionInRect:(NSRect)dirtyRect {
-        NSRect selectionRect = self.bounds;
-        [[NSColor clearColor] setFill];
-         NSBezierPath *selectionPath = [NSBezierPath bezierPathWithRoundedRect:selectionRect xRadius:0 yRadius:0];
-         [selectionPath fill];
-}
-
-- (void)mouseEntered:(NSEvent *)event {
-    [super mouseEntered:event];
-}
-
-@end
-
-#pragma mark - KMAnnotationStampTableviewCell
-
-@interface KMAnnotationStampTableviewCell : NSTableCellView
-
-@property (nonatomic,retain) IBOutlet NSImageView *sampleImageView;
-
-@property (nonatomic,retain) IBOutlet KMButton *deleteButton;
-
-@property (nonatomic,copy) void (^mouseMoveCallback) (BOOL mouseEntered);
-
-@property (nonatomic,copy) void (^mouseDownCallback) (BOOL downEntered);
-
-@end
-
-@implementation KMAnnotationStampTableviewCell
-
-
-- (void)viewDidMoveToWindow {
-    [super viewDidMoveToWindow];
-    if ([self window] != nil) {
-        NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:self.bounds options:NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingActiveAlways |NSTrackingMouseMoved owner:self userInfo:nil];
-        [self addTrackingArea:trackingArea];
-    }
-}
-
-- (void)mouseEntered:(NSEvent *)event {
-    [super mouseEntered:event];
-    
-    if (self.mouseMoveCallback) {
-        self.mouseMoveCallback(YES);
-    }
-}
-
-- (void)mouseExited:(NSEvent *)event {
-    [super mouseExited:event];
-    
-    if (self.mouseMoveCallback) {
-        self.mouseMoveCallback(NO);
-    }
-}
-
-- (void)mouseDown:(NSEvent *)event {
-    [super mouseDown:event];
-    
-    if (self.mouseDownCallback) {
-        self.mouseDownCallback(YES);
-    }
-}
-
-- (void)mouseUp:(NSEvent *)event {
-    [super mouseUp:event];
-    
-    if (self.mouseDownCallback) {
-        self.mouseDownCallback(NO);
-    }
-}
-
-@end
-
-@interface KMAnnotationStampViewController ()<NSTableViewDelegate,NSTableViewDataSource>
-@property (weak) IBOutlet NSTableView *tableView;
-@property (nonatomic,strong) NSMutableArray <CStampObject*> *stampLists;
-@property (weak) IBOutlet NSView *createStampView;
-
-@property (weak) IBOutlet NSImageView *sampleImageView; //当前选择的图章
-@property (weak) IBOutlet NSButton *rightRotationButton;
-@property (weak) IBOutlet NSButton *leftRotationButton;
-
-@property (weak) IBOutlet NSBox *sampleBox;
-@property (weak) IBOutlet NSView *clickStampView;
-@property (weak) IBOutlet NSBox *mainContentBox;
-
-@property (weak) IBOutlet NSView *choiceView;
-@property (weak) IBOutlet NSTextField *stampTitleLabel;
-@property (weak) IBOutlet NSButton *stampStypeoneButton;
-@property (weak) IBOutlet NSButton *stampStypeTwoButton;
-@property (weak) IBOutlet NSButton *stampStypeThreeButton;
-@property (weak) IBOutlet NSButton *addStampButton;
-
-@property (nonatomic,assign) NSInteger selectIndex;
-@property (nonatomic,assign) CPDFStampType currentType;
-
-@end
-
-@implementation KMAnnotationStampViewController
-
-- (void)dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    _tableView.delegate = nil;
-    _tableView.dataSource = nil;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    if(self.annotationModel && self.annotationModel.annotationType == CAnnotationTypeStamp && self.annotationModel.annotation) {
-        self.isClickSignatureList = YES;
-        if (self.isContinuousAddStamp) {
-            self.isClickSignatureList = NO;
-        }
-    }
-    [self configUI];
-    self.currentType = CPDFStampTypeDigital;
-    [self reloadStampData:CPDFStampTypeStandard];
-}
-
-#pragma mark - Getter & Setter
-
-- (void)reloadStampData:(CPDFStampType)selectIndex {
-    self.currentType = selectIndex;
-    if(self.currentType == CPDFStampTypeStandard || self.currentType == CPDFStampTypeDigital) {
-        [self.addStampButton setHidden:YES];
-    } else {
-        [self.addStampButton setHidden:NO];
-    }
-    self.stampLists = @[].mutableCopy;
-    [[KMStampManager defaultManager].stamps enumerateObjectsUsingBlock:^(CStampObject * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        if(self.currentType == CPDFStampTypeText) {
-            if(obj.stampCategoryType == CPDFStampTypeText || obj.stampCategoryType == CPDFStampTypeImage) {
-                [self.stampLists addObject:obj];
-            }
-        } else if (obj.stampCategoryType == self.currentType) {
-            [self.stampLists addObject:obj];
-        }
-       
-    }];
-    if(self.currentType == CPDFStampTypeText || self.currentType == CPDFStampTypeImage || self.currentType == CPDFStampTypeStandard) {
-        [self tableViewMenu];
-    } else {
-        self.tableView.menu = nil;
-    }
-    [self.tableView reloadData];
-}
-
-- (void)tableViewMenu {
-    NSMenu *menu = [[NSMenu alloc] init];
-//    [menu addItemWithTitle:NSLocalizedString(@"Edit the text stamp", nil) action:@selector(eidtCustomizeStamp) target:self];
-    NSMenuItem *item = [menu addItemWithTitle:NSLocalizedString(@"Export stamp", nil) action:nil target:self];
-    NSMenu *tSubMenu = [[NSMenu alloc] init];
-    NSMenuItem *tMenuItem = [tSubMenu insertItemWithTitle:NSLocalizedString(@"PNG", @"Menu item title") action:@selector(exportCustomizeStamp:) target:self atIndex:0];
-    tMenuItem.tag = 0;
-//    tMenuItem = [tSubMenu insertItemWithTitle:NSLocalizedString(@"JPG", @"Menu item title") action:@selector(exportCustomizeStamp:) target:self atIndex:1];
-//    tMenuItem.tag = 1;
-    tMenuItem = [tSubMenu insertItemWithTitle:NSLocalizedString(@"PDF", @"Menu item title") action:@selector(exportCustomizeStamp:) target:self atIndex:1];
-    tMenuItem.tag = 2;
-    item.submenu = tSubMenu;
-    if (self.currentType == CPDFStampTypeText || self.currentType == CPDFStampTypeImage) {
-        [menu addItem:[NSMenuItem separatorItem]];
-        [menu addItemWithTitle:NSLocalizedString(@"Delete stamp", nil) action:@selector(deleteCustomizeStamp) target:self];
-        [menu addItemWithTitle:NSLocalizedString(@"Delete All stamp", nil) action:@selector(deleteAllCustomizeStamp) target:self];
-    }
-    self.tableView.menu = menu;
-}
-
-#pragma mark - Private Method
-
-- (void)initClickStampView {
-    self.sampleBox.borderColor = [NSColor lightGrayColor];
-    self.sampleBox.fillColor = [NSColor whiteColor];
-    self.sampleBox.borderWidth = 0.0f;
-    [self.leftRotationButton setTitle:NSLocalizedString(@"Rotate Clockwise", nil)];
-    [self.rightRotationButton setTitle:NSLocalizedString(@"Rotate Counterclockwise", nil)];
-    self.leftRotationButton.wantsLayer =
-    self.rightRotationButton.wantsLayer = YES;
-    self.leftRotationButton.layer.borderWidth =
-    self.rightRotationButton.layer.borderWidth = 1;
-    self.leftRotationButton.layer.borderColor =
-    self.rightRotationButton.layer.borderColor = [NSColor blackColor].CGColor;
-    self.sampleImageView.image = ((CPDFStampAnnotation *)self.annotationModel.annotation).stampImage;
-}
-
-- (void)configUI {
-    self.choiceView.wantsLayer = YES;
-    self.choiceView.layer.backgroundColor = [NSColor whiteColor].CGColor;
-    self.tableView.backgroundColor = [NSColor colorWithRed:247.0/255.0 green:248.0/255.0 blue:250.0/255.0 alpha:1];
-    if(!self.isClickSignatureList) {
-        self.mainContentBox.contentView = self.createStampView;
-       
-        self.selectIndex = 0;
-      
-        [self reloadStampData:0];
-        self.stampTitleLabel.stringValue = NSLocalizedString(@"Stamp", nil);
-    }else {
-        self.mainContentBox.contentView = self.clickStampView;
-        [self initClickStampView];
-        self.stampTitleLabel.stringValue = NSLocalizedString(@"Stamp", nil);
-    }
-    
-    self.choiceView.wantsLayer =
-    self.stampStypeoneButton.wantsLayer =
-    self.stampStypeTwoButton.wantsLayer =
-    self.stampStypeThreeButton.wantsLayer = YES;
-    self.choiceView.layer.cornerRadius =
-    self.stampStypeoneButton.layer.cornerRadius =
-    self.stampStypeTwoButton.layer.cornerRadius  =
-    self.stampStypeThreeButton.layer.cornerRadius = 4.0;
-    self.choiceView.layer.backgroundColor = [NSColor lightGrayColor].CGColor;
-    self.stampStypeoneButton.layer.backgroundColor = [NSColor whiteColor].CGColor;
-    self.stampStypeTwoButton.layer.backgroundColor = [NSColor clearColor].CGColor;
-    self.stampStypeThreeButton.layer.backgroundColor = [NSColor clearColor].CGColor;
-    
-    self.stampTitleLabel.font = [NSFont systemFontOfSize:14];
-    [self.stampStypeoneButton setTitle:NSLocalizedString(@"Standard", nil)];
-    [self.stampStypeTwoButton setTitle:NSLocalizedString(@"Dynamic", nil)];
-    [self.stampStypeThreeButton setTitle:NSLocalizedString(@"Customize", nil)];
-    [self.addStampButton setHidden:YES];
-    
-}
-
-
-#pragma mark - Button Methods
-
-- (void)tableCellCloseButton_Click:(NSButton *)button {
-    NSInteger index = button.tag;
-    CStampObject *stamp = [self.stampLists objectAtIndex:index];
-    if([[KMStampManager defaultManager] removeStamp:stamp]) {
-        [self.stampLists removeObject:stamp];
-        [self.tableView reloadData];
-    }
-}
-
-- (void)pdfAddStampAction {
-    if (_tableView.selectedRow < self.stampLists.count && _tableView.selectedRow >= 0) {
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"KMContinuousAdditionStamp"];
-        
-        CStampObject *stamp = [self.stampLists objectAtIndex:_tableView.selectedRow];
-        [self.pdfView setAddStampObject:stamp keepToolModel:NO];
-    }
-}
-
-- (IBAction)addStampButton_Click:(id)sender {
-    __block typeof(self) blockSelf = self;
-    if (self.currentType == CPDFStampTypeText || self.currentType == CPDFStampTypeImage) {
-        KMCustomizeStampViewController *vc = [[KMCustomizeStampViewController alloc] init];
-        vc.stampCallBack = ^(CStampObject *stamp) {
-            if(stamp) {
-                [[KMStampManager defaultManager] addStamp:stamp];
-                [blockSelf reloadStampData:blockSelf.currentType];
-            }
-        };
-        [self presentViewControllerAsModalWindow:vc];
-    } else if (self.currentType == 4/*CPDFStampTypeDynamic*/) {
-            KMDynamicStampViewController *vc = [[KMDynamicStampViewController alloc] init];
-            vc.callBack = ^{
-                [[KMStampManager defaultManager] removeStampsWithArray:blockSelf.stampLists];
-                [[KMStampManager defaultManager] addStampsWithArray:[[KMStampManager defaultManager] dynamicStamps]];
-                [blockSelf reloadStampData:blockSelf.currentType];
-            };
-            [self presentViewControllerAsModalWindow:vc]; 
-    }
-}
-
-- (IBAction)standardoneButton_Click:(id)sender {
-    [self reloadStampData:CPDFStampTypeStandard];
-    self.stampStypeoneButton.wantsLayer =
-    self.stampStypeTwoButton.wantsLayer =
-    self.stampStypeThreeButton.wantsLayer = YES;
-    self.stampStypeoneButton.layer.backgroundColor = [NSColor whiteColor].CGColor;
-    self.stampStypeTwoButton.layer.backgroundColor = [NSColor clearColor].CGColor;
-    self.stampStypeThreeButton.layer.backgroundColor = [NSColor clearColor].CGColor;
-}
-
-- (IBAction)standardtwoButton_Click:(id)sender {
-    [self reloadStampData:4/*CPDFStampTypeDynamic*/];
-    self.stampStypeoneButton.wantsLayer =
-    self.stampStypeTwoButton.wantsLayer =
-    self.stampStypeThreeButton.wantsLayer = YES;
-    self.stampStypeoneButton.layer.backgroundColor = [NSColor clearColor].CGColor;
-    self.stampStypeTwoButton.layer.backgroundColor = [NSColor whiteColor].CGColor;
-    self.stampStypeThreeButton.layer.backgroundColor = [NSColor clearColor].CGColor;
-}
-
-- (IBAction)standardthreeButton_Click:(id)sender {
-    [self reloadStampData:CPDFStampTypeText];
-    self.stampStypeoneButton.wantsLayer =
-    self.stampStypeTwoButton.wantsLayer =
-    self.stampStypeThreeButton.wantsLayer = YES;
-    self.stampStypeoneButton.layer.backgroundColor = [NSColor clearColor].CGColor;
-    self.stampStypeTwoButton.layer.backgroundColor = [NSColor clearColor].CGColor;
-    self.stampStypeThreeButton.layer.backgroundColor = [NSColor whiteColor].CGColor;
-}
-- (IBAction)rightRotationButton_Click:(id)sender {
-    CPDFStampAnnotation *stampAnnotation = self.annotationModel.annotation;
-    [self.pdfView rotateStampAnnotation:stampAnnotation rotateAngle:90];
-}
-
-- (IBAction)leftRotationButton_Click:(id)sender {
-    [self.pdfView rotateStampAnnotation:(CPDFListStampAnnotation*)self.annotationModel.annotation rotateAngle:-90];
-}
-
-//MARK: menu Action
-
-- (void)eidtCustomizeStamp {
-    __block typeof(self) blockSelf = self;
-    if(self.tableView.selectedRow >= 0 && self.tableView.selectedRow < self.stampLists.count) {
-        CStampObject *stamp = self.stampLists[self.tableView.selectedRow];
-        KMCustomizeStampViewController *vc = [[KMCustomizeStampViewController alloc] init];
-        vc.currentStamp = stamp;
-        vc.stampCallBack = ^(CStampObject *newstamp) {
-            if(stamp) {
-                [[KMStampManager defaultManager] removeStamp:stamp];
-                [[KMStampManager defaultManager] addStamp:newstamp];
-                [blockSelf reloadStampData:blockSelf.currentType];
-            }
-        };
-        [self presentViewControllerAsModalWindow:vc];
-    }
-}
-
-- (void)exportCustomizeStamp:(NSMenuItem *)sender {
-    NSInteger index = self.tableView.clickedRow;
-    NSInteger type = sender.tag;
-    NSImage *image = self.stampLists[index].stampPreImage;
-    if (type == 0) {
-        NSData *data = image.TIFFRepresentation;
-        NSBitmapImageRep *imageRep = [NSBitmapImageRep imageRepWithData:data];
-        [imageRep setSize:image.size];
-        NSData *imageData = [imageRep representationUsingType:NSPNGFileType properties:@{}];
-        
-        NSSavePanel *savePanel = [NSSavePanel savePanel];
-        savePanel.allowedFileTypes = @[@"png"];
-        [savePanel beginSheetModalForWindow:[NSApp mainWindow] completionHandler:^(NSInteger result) {
-            if (result) {
-                if ([imageData writeToURL:savePanel.URL atomically:YES]) {
-                    [[NSWorkspace sharedWorkspace] selectFile:savePanel.URL.path
-                                     inFileViewerRootedAtPath:@""];
-                }
-            }
-        }];
-    } else if (type == 1) {
-        NSData *data = image.TIFFRepresentation;
-        NSBitmapImageRep *imageRep = [NSBitmapImageRep imageRepWithData:data];
-        [imageRep setSize:image.size];
-        NSData *imageData = [imageRep representationUsingType:NSJPEGFileType properties:@{}];
-        
-        NSSavePanel *savePanel = [NSSavePanel savePanel];
-        savePanel.allowedFileTypes = @[@"jpg"];
-        [savePanel beginSheetModalForWindow:[NSApp mainWindow] completionHandler:^(NSInteger result) {
-            if (result) {
-                if ([imageData writeToURL:savePanel.URL atomically:YES]) {
-                    [[NSWorkspace sharedWorkspace] selectFile:savePanel.URL.path
-                                     inFileViewerRootedAtPath:@""];
-                }
-            }
-        }];
-    } else {
-        CPDFDocument *pdf = [[CPDFDocument alloc] init];
-        NSString *signatureImagePath =[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"signatureImage.png"];
-        NSData *data = image.TIFFRepresentation;
-        [data writeToURL:[NSURL fileURLWithPath:signatureImagePath] atomically:YES];
-        [pdf insertPage:image.size withImage:signatureImagePath atIndex:0];
-
-        
-        NSSavePanel *savePanel = [NSSavePanel savePanel];
-        savePanel.allowedFileTypes = @[@"pdf"];
-        [savePanel beginSheetModalForWindow:[NSApp mainWindow] completionHandler:^(NSInteger result) {
-            if (result) {
-                if ([pdf writeToURL:savePanel.URL]) {
-                    [[NSWorkspace sharedWorkspace] selectFile:savePanel.URL.path
-                                     inFileViewerRootedAtPath:@""];
-                }
-            }
-        }];
-    }
-}
-
-- (void)deleteCustomizeStamp {
-    if(self.tableView.selectedRow >= 0 && self.tableView.selectedRow < self.stampLists.count) {
-        CStampObject *stamp = self.stampLists[self.tableView.selectedRow];
-        [[KMStampManager defaultManager] removeStamp:stamp];
-        [self reloadStampData:self.currentType];
-    }
-}
-
-- (void)deleteAllCustomizeStamp {
-    [[KMStampManager defaultManager] removeStampsWithArray:self.stampLists];
-    [self reloadStampData:self.currentType];
-}
-
-#pragma mark - NSTableViewDelegate,NSTableViewDataSource
-
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
-    return self.stampLists.count;
-}
-
-- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    KMAnnotationStampTableviewCell *cellView = [tableView makeViewWithIdentifier:@"KMAnnotationStampTableviewCell" owner:self];
-    CStampObject *stamp = [self.stampLists objectAtIndex:row];
-    cellView.sampleImageView.image = stamp.stampPreImage;
-    cellView.wantsLayer = YES;
-    cellView.layer.backgroundColor = [NSColor clearColor].CGColor;
-    cellView.deleteButton.hidden = YES;
-    __block typeof(KMAnnotationStampTableviewCell) *blockcellView = cellView;
-    cellView.mouseMoveCallback = ^(BOOL mouseEntered) {
-        if (mouseEntered) {
-            blockcellView.wantsLayer = YES;
-            blockcellView.layer.cornerRadius = 8.0;
-            blockcellView.layer.borderColor = [NSColor colorWithRed:206.0/255.0 green:208.0/255.0 blue:212.0/255.0 alpha:1].CGColor;
-            blockcellView.layer.backgroundColor = [NSColor colorWithRed:206.0/255.0 green:208.0/255.0 blue:212.0/255.0 alpha:0.6].CGColor;
-            if(stamp.stampCategoryType != 0) {
-                blockcellView.deleteButton.hidden = NO;
-            }
-        } else {
-            blockcellView.wantsLayer = YES;
-            blockcellView.layer.backgroundColor = [NSColor clearColor].CGColor;
-            blockcellView.deleteButton.hidden = YES;
-         
-        }
-    };
-    cellView.deleteButton.tag = row;
-    [cellView.deleteButton setTarget:self];
-    [cellView.deleteButton setAction:@selector(tableCellCloseButton_Click:)];
-    return cellView;
-}
-
-- (NSTableRowView *)tableView:(NSTableView *)tableView rowViewForRow:(NSInteger)row {
-    KMStampTableRowView *rowView = [[KMStampTableRowView alloc] init];
-    return rowView;
-}
-
-- (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row {
-    return 68;
-}
-
-- (void)tableViewSelectionDidChange:(NSNotification *)notification {
-    [self pdfAddStampAction];
-}
-
-@end

File diff suppressed because it is too large
+ 1502 - 0
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.swift


+ 655 - 198
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.xib

@@ -1,334 +1,791 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMAnnotationStampViewController">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMAnnotationStampViewController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
-                <outlet property="addStampButton" destination="52c-SM-Dav" id="dz2-ky-4A1"/>
-                <outlet property="choiceView" destination="rcW-g0-ndG" id="aHx-9j-M2U"/>
-                <outlet property="clickStampView" destination="qKf-ge-VzH" id="dqy-lD-RBB"/>
-                <outlet property="createStampView" destination="Hz6-mo-xeY" id="WNR-w0-65I"/>
-                <outlet property="leftRotationButton" destination="z8p-I5-cAT" id="PUg-Vc-5R5"/>
-                <outlet property="mainContentBox" destination="Nch-P7-fZj" id="V9n-bn-5fH"/>
-                <outlet property="rightRotationButton" destination="nBG-3i-iym" id="dpT-BP-2eE"/>
-                <outlet property="sampleBox" destination="FSa-kq-l83" id="cJ6-Y7-PoE"/>
-                <outlet property="sampleImageView" destination="92q-eX-E7j" id="K0f-tV-3J3"/>
-                <outlet property="stampStypeThreeButton" destination="cfq-dz-U2H" id="4V7-86-q48"/>
-                <outlet property="stampStypeTwoButton" destination="qOe-3d-iez" id="osy-gq-HRv"/>
-                <outlet property="stampStypeoneButton" destination="h5c-oD-e3y" id="IHE-81-cf6"/>
-                <outlet property="stampTitleLabel" destination="Svb-0E-Z6j" id="KhO-kG-RQe"/>
-                <outlet property="tableView" destination="6iW-fT-OnT" id="Q0G-2i-cgL"/>
-                <outlet property="view" destination="zuA-3M-c6K" id="TFS-hL-7j3"/>
+                <outlet property="addButton" destination="XEv-5I-scI" id="f6Z-MG-7Ce"/>
+                <outlet property="annotationBox" destination="IFI-8g-CYh" id="jHE-xx-RTm"/>
+                <outlet property="annotationLabel" destination="UsV-0m-nUC" id="Oab-0U-7aF"/>
+                <outlet property="authorLabel" destination="nfe-06-8Hb" id="ALo-Gj-ukv"/>
+                <outlet property="authorTextField" destination="Cf3-ij-TW3" id="eAp-PG-X9i"/>
+                <outlet property="clickStampView" destination="Aj7-0M-710" id="UoM-Se-ycb"/>
+                <outlet property="contentTextView" destination="lq6-MU-1hZ" id="ZTH-2a-4Xn"/>
+                <outlet property="createScrollView" destination="Qfb-JE-bUl" id="8Zj-ee-ixg"/>
+                <outlet property="createStampTableView" destination="bps-jM-pPg" id="Jqt-MY-BxR"/>
+                <outlet property="createStampView" destination="aVc-V7-FBS" id="Qik-ed-h3Z"/>
+                <outlet property="customBox" destination="9dQ-3R-rf8" id="XJn-V3-O6o"/>
+                <outlet property="customLabel" destination="HfE-48-3lV" id="dEm-G9-Wvs"/>
+                <outlet property="customView" destination="RNY-Tv-xZx" id="74C-xP-buR"/>
+                <outlet property="dateBox" destination="j61-6m-eFB" id="Rwb-4s-XrJ"/>
+                <outlet property="dateComboBox" destination="wtD-Vt-js7" id="tuc-Fu-OG7"/>
+                <outlet property="dateLabel" destination="CiP-Jz-Xdn" id="eUB-SN-HOx"/>
+                <outlet property="dynamicBox" destination="a4J-25-yUn" id="Zez-Eb-z8u"/>
+                <outlet property="dynamicLabel" destination="I93-Ww-ckj" id="2Aw-Rb-Huk"/>
+                <outlet property="dynamicView" destination="3V9-UO-YC8" id="eWw-86-SyM"/>
+                <outlet property="emptyImageView" destination="1zh-o3-BQF" id="RC0-6V-JXf"/>
+                <outlet property="emptyLabel" destination="VYn-hy-KP4" id="8YG-6q-omp"/>
+                <outlet property="emptyView" destination="Skb-rC-s7k" id="uSL-kC-dkt"/>
+                <outlet property="footBox" destination="cRx-Wh-6fg" id="IwR-k8-h4u"/>
+                <outlet property="footBoxHeightLayoutConstraint" destination="Vg0-Ig-vmZ" id="94G-if-KgZ"/>
+                <outlet property="imageStampButton" destination="zG5-2e-zz5" id="g4B-DR-iwN"/>
+                <outlet property="leftImageView" destination="knm-jT-kZT" id="Loq-E6-YBb"/>
+                <outlet property="leftRotateBox" destination="Nf2-e7-zm4" id="hRB-pr-P6J"/>
+                <outlet property="leftRotateImage" destination="xeG-af-M7X" id="NWO-nB-Gck"/>
+                <outlet property="mainViewBox" destination="dv7-QJ-FuP" id="zpz-Ic-XgR"/>
+                <outlet property="noCustomStampLabel" destination="Mlh-u9-cE0" id="lrL-mT-quP"/>
+                <outlet property="opacityBox" destination="22t-Qb-mZk" id="DbL-2a-VT3"/>
+                <outlet property="opacityBoxTopLayoutConstraint" destination="qJi-l1-DIj" id="enu-DV-Lhf"/>
+                <outlet property="opacityComboBox" destination="clF-X8-CfE" id="5kx-g5-TPS"/>
+                <outlet property="opacityLabel" destination="Dl7-N2-sZY" id="8yP-fq-tNm"/>
+                <outlet property="opacitySlider" destination="cXF-Rh-krb" id="NK2-zh-GAx"/>
+                <outlet property="rightImageView" destination="0Vm-xD-dRM" id="5Um-VN-9iz"/>
+                <outlet property="rightRotateBox" destination="6Vm-3i-iSJ" id="woE-Qt-3Tp"/>
+                <outlet property="rightRotateImage" destination="awq-J6-Rn6" id="yqj-yx-4DY"/>
+                <outlet property="rotateBox" destination="JXe-4Q-gCs" id="r72-cV-Aea"/>
+                <outlet property="rotateLabel" destination="tKZ-fa-8Ft" id="jen-4l-ZjJ"/>
+                <outlet property="sampleBox" destination="boX-w4-4Qf" id="JGZ-TY-Ugq"/>
+                <outlet property="sampleImageView" destination="EEJ-mI-fRi" id="UD9-g6-9Yg"/>
+                <outlet property="selectButton" destination="w8O-ky-GkI" id="fXO-XY-uoC"/>
+                <outlet property="signatureAddView" destination="CpL-4i-FVy" id="QR9-4b-kfj"/>
+                <outlet property="stampTypeTopLayoutConstraint" destination="dqA-pe-XXh" id="P0Q-nD-jQt"/>
+                <outlet property="standardBox" destination="4Ch-5s-yLs" id="C47-pd-NjL"/>
+                <outlet property="standardLabel" destination="0E3-F3-2Pg" id="xt6-tl-hVB"/>
+                <outlet property="tableViewLayoutConstraint" destination="z3z-OO-F8d" id="wjc-Mj-lNJ"/>
+                <outlet property="textStampButton" destination="16J-eB-gZj" id="K77-MS-2b6"/>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="208" height="407"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="285" height="599"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="dv7-QJ-FuP">
+                    <rect key="frame" x="0.0" y="0.0" width="285" height="599"/>
+                    <view key="contentView" id="f5L-F3-Hix">
+                        <rect key="frame" x="0.0" y="0.0" width="285" height="599"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    </view>
+                </box>
+            </subviews>
+            <constraints>
+                <constraint firstItem="dv7-QJ-FuP" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="IrL-C6-RNa"/>
+                <constraint firstAttribute="bottom" secondItem="dv7-QJ-FuP" secondAttribute="bottom" id="JQp-fG-CLn"/>
+                <constraint firstAttribute="trailing" secondItem="dv7-QJ-FuP" secondAttribute="trailing" id="n5w-xT-ZVQ"/>
+                <constraint firstItem="dv7-QJ-FuP" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="uBR-42-h52"/>
+            </constraints>
+            <point key="canvasLocation" x="-99.5" y="299.5"/>
+        </customView>
+        <customView misplaced="YES" id="aVc-V7-FBS">
+            <rect key="frame" x="0.0" y="0.0" width="237" height="599"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
             <subviews>
-                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="63" horizontalPageScroll="10" verticalLineScroll="63" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lIb-6B-0XZ">
-                    <rect key="frame" x="0.0" y="0.0" width="208" height="365"/>
-                    <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="dw4-ZQ-5dJ">
-                        <rect key="frame" x="0.0" y="0.0" width="208" height="365"/>
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="4Ch-5s-yLs" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                    <rect key="frame" x="0.0" y="567" width="78" height="32"/>
+                    <view key="contentView" id="V6X-u1-jNc">
+                        <rect key="frame" x="0.0" y="0.0" width="78" height="32"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0E3-F3-2Pg">
+                                <rect key="frame" x="37" y="8" width="4" height="16"/>
+                                <textFieldCell key="cell" lineBreakMode="clipping" id="MOs-Eb-Gx1">
+                                    <font key="font" usesAppearanceFont="YES"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                        </subviews>
+                    </view>
+                    <constraints>
+                        <constraint firstItem="0E3-F3-2Pg" firstAttribute="centerY" secondItem="4Ch-5s-yLs" secondAttribute="centerY" id="7Ci-4w-owX"/>
+                        <constraint firstAttribute="height" constant="32" id="Qp8-hl-UDW"/>
+                        <constraint firstItem="0E3-F3-2Pg" firstAttribute="centerX" secondItem="4Ch-5s-yLs" secondAttribute="centerX" id="h0G-GB-qie"/>
+                    </constraints>
+                </box>
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="9dQ-3R-rf8" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                    <rect key="frame" x="78" y="567" width="78" height="32"/>
+                    <view key="contentView" id="BYe-v1-Pon">
+                        <rect key="frame" x="0.0" y="0.0" width="78" height="32"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HfE-48-3lV">
+                                <rect key="frame" x="37" y="8" width="4" height="16"/>
+                                <textFieldCell key="cell" lineBreakMode="clipping" id="QTD-ci-jYJ">
+                                    <font key="font" usesAppearanceFont="YES"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="knm-jT-kZT">
+                                <rect key="frame" x="0.0" y="4" width="1" height="24"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="1" id="Aph-Ik-jtA"/>
+                                </constraints>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="i3V-lV-MzN"/>
+                            </imageView>
+                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0Vm-xD-dRM">
+                                <rect key="frame" x="77" y="4" width="1" height="24"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="1" id="x6A-zp-yGg"/>
+                                </constraints>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="rww-46-m63"/>
+                            </imageView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="0Vm-xD-dRM" firstAttribute="top" secondItem="BYe-v1-Pon" secondAttribute="top" constant="4" id="OJu-wR-WYV"/>
+                            <constraint firstAttribute="trailing" secondItem="0Vm-xD-dRM" secondAttribute="trailing" id="Qbg-AY-Vxo"/>
+                            <constraint firstItem="knm-jT-kZT" firstAttribute="top" secondItem="BYe-v1-Pon" secondAttribute="top" constant="4" id="eLx-h7-qkx"/>
+                            <constraint firstItem="knm-jT-kZT" firstAttribute="leading" secondItem="BYe-v1-Pon" secondAttribute="leading" id="xaR-qw-taf"/>
+                            <constraint firstAttribute="bottom" secondItem="0Vm-xD-dRM" secondAttribute="bottom" constant="4" id="yQP-rg-ruW"/>
+                            <constraint firstAttribute="bottom" secondItem="knm-jT-kZT" secondAttribute="bottom" constant="4" id="yqi-Kv-28F"/>
+                        </constraints>
+                    </view>
+                    <constraints>
+                        <constraint firstItem="HfE-48-3lV" firstAttribute="centerX" secondItem="9dQ-3R-rf8" secondAttribute="centerX" id="1Mn-hO-Ufj"/>
+                        <constraint firstItem="HfE-48-3lV" firstAttribute="centerY" secondItem="9dQ-3R-rf8" secondAttribute="centerY" id="JEM-9c-5Yu"/>
+                    </constraints>
+                </box>
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="a4J-25-yUn" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                    <rect key="frame" x="156" y="567" width="78" height="32"/>
+                    <view key="contentView" id="eMa-S7-OOl">
+                        <rect key="frame" x="0.0" y="0.0" width="78" height="32"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="I93-Ww-ckj">
+                                <rect key="frame" x="37" y="8" width="4" height="16"/>
+                                <textFieldCell key="cell" lineBreakMode="clipping" id="dRl-PU-bWG">
+                                    <font key="font" usesAppearanceFont="YES"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                        </subviews>
+                    </view>
+                    <constraints>
+                        <constraint firstItem="I93-Ww-ckj" firstAttribute="centerX" secondItem="a4J-25-yUn" secondAttribute="centerX" id="Bjw-Ui-ImQ"/>
+                        <constraint firstItem="I93-Ww-ckj" firstAttribute="centerY" secondItem="a4J-25-yUn" secondAttribute="centerY" id="Hjj-NZ-SWF"/>
+                    </constraints>
+                </box>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Skb-rC-s7k">
+                    <rect key="frame" x="0.0" y="60" width="234" height="507"/>
+                    <subviews>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="mfJ-dx-emK">
+                            <rect key="frame" x="0.0" y="142" width="234" height="224"/>
+                            <subviews>
+                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="1zh-o3-BQF">
+                                    <rect key="frame" x="47" y="84" width="140" height="140"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="140" id="LXf-GC-q6q"/>
+                                        <constraint firstAttribute="width" constant="140" id="k6C-Yv-fq9"/>
+                                    </constraints>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameEmptyStamp" id="Wgu-2B-PFT"/>
+                                </imageView>
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VYn-hy-KP4">
+                                    <rect key="frame" x="15" y="0.0" width="204" height="40"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="40" id="9pg-4b-Ee9"/>
+                                        <constraint firstAttribute="width" constant="200" id="oEC-88-fQT"/>
+                                    </constraints>
+                                    <textFieldCell key="cell" lineBreakMode="charWrapping" alignment="center" title="Click \&quot;Text Stamp\&quot; button below to create a custom stamp." id="YIS-ja-oEX">
+                                        <font key="font" metaFont="system" size="14"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mlh-u9-cE0">
+                                    <rect key="frame" x="55" y="48" width="124" height="20"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="20" id="CVU-xa-gXa"/>
+                                    </constraints>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="no Custom Stamp" id="LSP-TD-Koa">
+                                        <font key="font" metaFont="systemSemibold" size="14"/>
+                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </subviews>
+                            <constraints>
+                                <constraint firstItem="1zh-o3-BQF" firstAttribute="top" secondItem="mfJ-dx-emK" secondAttribute="top" id="OPL-Qa-shs"/>
+                                <constraint firstItem="VYn-hy-KP4" firstAttribute="top" secondItem="Mlh-u9-cE0" secondAttribute="bottom" constant="8" id="Vas-kT-7Ov"/>
+                                <constraint firstItem="1zh-o3-BQF" firstAttribute="centerX" secondItem="mfJ-dx-emK" secondAttribute="centerX" id="aM8-V9-Lgo"/>
+                                <constraint firstItem="Mlh-u9-cE0" firstAttribute="top" secondItem="1zh-o3-BQF" secondAttribute="bottom" constant="16" id="dNC-rb-a9w"/>
+                                <constraint firstAttribute="bottom" secondItem="VYn-hy-KP4" secondAttribute="bottom" id="hko-CW-rV8"/>
+                            </constraints>
+                        </customView>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="mfJ-dx-emK" firstAttribute="centerY" secondItem="Skb-rC-s7k" secondAttribute="centerY" id="Nri-eR-7AU"/>
+                        <constraint firstItem="Mlh-u9-cE0" firstAttribute="centerX" secondItem="Skb-rC-s7k" secondAttribute="centerX" id="OE4-LK-u9d"/>
+                        <constraint firstItem="mfJ-dx-emK" firstAttribute="centerX" secondItem="Skb-rC-s7k" secondAttribute="centerX" id="OGh-Oc-Kdw"/>
+                        <constraint firstItem="VYn-hy-KP4" firstAttribute="centerX" secondItem="Skb-rC-s7k" secondAttribute="centerX" id="YpW-8w-FZV"/>
+                        <constraint firstItem="mfJ-dx-emK" firstAttribute="leading" secondItem="Skb-rC-s7k" secondAttribute="leading" id="ZFk-IQ-fGN"/>
+                        <constraint firstAttribute="trailing" secondItem="mfJ-dx-emK" secondAttribute="trailing" id="bx7-kO-Be2"/>
+                    </constraints>
+                </customView>
+                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="64" horizontalPageScroll="10" verticalLineScroll="64" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qfb-JE-bUl">
+                    <rect key="frame" x="0.0" y="60" width="234" height="507"/>
+                    <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="QFb-tg-EJh">
+                        <rect key="frame" x="0.0" y="0.0" width="234" height="507"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="63" rowSizeStyle="automatic" viewBased="YES" id="6iW-fT-OnT">
-                                <rect key="frame" x="0.0" y="0.0" width="208" height="365"/>
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="64" viewBased="YES" id="bps-jM-pPg">
+                                <rect key="frame" x="0.0" y="0.0" width="234" height="507"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" red="0.14901960784313725" green="0.15686274509803921" blue="0.16862745098039217" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn width="196" minWidth="40" maxWidth="1000" id="Zw8-wv-ebL">
+                                    <tableColumn width="222" minWidth="40" maxWidth="1000" id="pvk-zw-ZOL">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
-                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="gsW-dI-hWI">
+                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="Xb2-8x-zJ5">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
-                                            <tableCellView identifier="KMAnnotationStampTableviewCell" id="nTM-A9-ieX" customClass="KMAnnotationStampTableviewCell">
-                                                <rect key="frame" x="0.0" y="0.0" width="208" height="63"/>
+                                            <tableCellView identifier="KMAnnotationStampTableviewCell" id="Zvl-qd-COf" customClass="KMAnnotationStampTableviewCell" customModule="PDF_Master" customModuleProvider="target">
+                                                <rect key="frame" x="0.0" y="0.0" width="234" height="63"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="m1U-3Q-qJt">
-                                                        <rect key="frame" x="42" y="2" width="124" height="59"/>
-                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" id="GTC-oP-pzy"/>
-                                                    </imageView>
-                                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kDA-VR-S07" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
-                                                        <rect key="frame" x="166" y="33" width="30" height="30"/>
-                                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNamePropertybarDeleteStamp" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="kIq-i6-QOl">
+                                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Qad-jo-qZT">
+                                                        <rect key="frame" x="192" y="25" width="30" height="30"/>
+                                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameUXIconBtnCloseNor" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="PA9-va-fLK">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="system"/>
                                                         </buttonCell>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="30" id="IYp-hd-EmP"/>
-                                                            <constraint firstAttribute="width" constant="30" id="idi-vm-YfZ"/>
+                                                            <constraint firstAttribute="width" constant="30" id="e2V-lK-Zwb"/>
+                                                            <constraint firstAttribute="height" constant="30" id="mSl-xH-a5Q"/>
                                                         </constraints>
                                                     </button>
+                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="eTj-uO-pMw">
+                                                        <rect key="frame" x="42" y="5" width="150" height="53"/>
+                                                        <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="PUm-n8-CM1">
+                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                            <font key="font" metaFont="system"/>
+                                                        </buttonCell>
+                                                    </button>
                                                 </subviews>
                                                 <constraints>
-                                                    <constraint firstItem="kDA-VR-S07" firstAttribute="leading" secondItem="m1U-3Q-qJt" secondAttribute="trailing" id="dDj-Ah-WSh"/>
-                                                    <constraint firstItem="m1U-3Q-qJt" firstAttribute="top" secondItem="nTM-A9-ieX" secondAttribute="top" constant="2" id="lS0-3g-jh2"/>
-                                                    <constraint firstItem="m1U-3Q-qJt" firstAttribute="centerX" secondItem="nTM-A9-ieX" secondAttribute="centerX" id="pPI-DQ-NTw"/>
-                                                    <constraint firstAttribute="trailing" secondItem="kDA-VR-S07" secondAttribute="trailing" constant="12" id="qg2-Yi-SaA"/>
-                                                    <constraint firstItem="kDA-VR-S07" firstAttribute="top" secondItem="nTM-A9-ieX" secondAttribute="top" id="wTl-Sp-kwa"/>
-                                                    <constraint firstAttribute="bottom" secondItem="m1U-3Q-qJt" secondAttribute="bottom" constant="2" id="xKo-vB-4c1"/>
+                                                    <constraint firstItem="eTj-uO-pMw" firstAttribute="top" secondItem="Zvl-qd-COf" secondAttribute="top" constant="5" id="37O-2k-Kgc"/>
+                                                    <constraint firstItem="Qad-jo-qZT" firstAttribute="top" secondItem="Zvl-qd-COf" secondAttribute="top" constant="8" id="WUa-UN-5Sr"/>
+                                                    <constraint firstAttribute="trailing" secondItem="Qad-jo-qZT" secondAttribute="trailing" constant="12" id="a4v-cG-5Pf"/>
+                                                    <constraint firstItem="Qad-jo-qZT" firstAttribute="leading" secondItem="eTj-uO-pMw" secondAttribute="trailing" id="cGV-kD-vr4"/>
+                                                    <constraint firstItem="eTj-uO-pMw" firstAttribute="centerX" secondItem="Zvl-qd-COf" secondAttribute="centerX" id="eeg-Hr-Tdd"/>
+                                                    <constraint firstAttribute="bottom" secondItem="eTj-uO-pMw" secondAttribute="bottom" constant="5" id="hMs-b6-Jdi"/>
                                                 </constraints>
                                                 <connections>
-                                                    <outlet property="deleteButton" destination="kDA-VR-S07" id="kCV-Wk-t5g"/>
-                                                    <outlet property="sampleImageView" destination="m1U-3Q-qJt" id="723-fh-PyZ"/>
+                                                    <outlet property="closeButton" destination="Qad-jo-qZT" id="TxR-BG-L9e"/>
+                                                    <outlet property="sampleImageButton" destination="eTj-uO-pMw" id="Wzn-50-Mwy"/>
                                                 </connections>
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
                                 </tableColumns>
                                 <connections>
-                                    <outlet property="dataSource" destination="-2" id="6HH-3e-Bjr"/>
-                                    <outlet property="delegate" destination="-2" id="VRB-yz-GOP"/>
+                                    <outlet property="dataSource" destination="-2" id="0e6-Ox-Yh2"/>
+                                    <outlet property="delegate" destination="-2" id="kga-0b-FOH"/>
                                 </connections>
                             </tableView>
                         </subviews>
                         <nil key="backgroundColor"/>
                     </clipView>
-                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="meS-UN-5za">
-                        <rect key="frame" x="-100" y="-100" width="168" height="15"/>
+                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="FvQ-wX-xpW">
+                        <rect key="frame" x="-100" y="-100" width="238" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
-                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="tuz-36-BLg">
-                        <rect key="frame" x="224" y="17" width="15" height="102"/>
+                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="iW7-fg-HGa">
+                        <rect key="frame" x="-100" y="-100" width="15" height="102"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                 </scrollView>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="rcW-g0-ndG">
-                    <rect key="frame" x="0.0" y="407" width="208" height="32"/>
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="cRx-Wh-6fg">
+                    <rect key="frame" x="0.0" y="0.0" width="234" height="60"/>
+                    <view key="contentView" id="6Av-83-5iE">
+                        <rect key="frame" x="0.0" y="0.0" width="234" height="60"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    </view>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="Vg0-Ig-vmZ"/>
+                    </constraints>
+                </box>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="a4J-25-yUn" secondAttribute="trailing" id="01E-Hy-S0x"/>
+                <constraint firstItem="Qfb-JE-bUl" firstAttribute="top" secondItem="4Ch-5s-yLs" secondAttribute="bottom" id="5Qd-da-4qF"/>
+                <constraint firstItem="cRx-Wh-6fg" firstAttribute="leading" secondItem="aVc-V7-FBS" secondAttribute="leading" id="6aI-DO-c0i"/>
+                <constraint firstItem="a4J-25-yUn" firstAttribute="top" secondItem="4Ch-5s-yLs" secondAttribute="top" id="Bih-fw-cow"/>
+                <constraint firstItem="9dQ-3R-rf8" firstAttribute="height" secondItem="4Ch-5s-yLs" secondAttribute="height" id="JBW-HJ-GRX"/>
+                <constraint firstItem="9dQ-3R-rf8" firstAttribute="leading" secondItem="4Ch-5s-yLs" secondAttribute="trailing" id="RBs-vg-Y1Z"/>
+                <constraint firstItem="Skb-rC-s7k" firstAttribute="leading" secondItem="Qfb-JE-bUl" secondAttribute="leading" id="TTi-Zp-39S"/>
+                <constraint firstItem="Qfb-JE-bUl" firstAttribute="leading" secondItem="aVc-V7-FBS" secondAttribute="leading" id="ZOY-Jz-s51"/>
+                <constraint firstItem="4Ch-5s-yLs" firstAttribute="leading" secondItem="aVc-V7-FBS" secondAttribute="leading" id="bte-oz-Oly"/>
+                <constraint firstItem="a4J-25-yUn" firstAttribute="leading" secondItem="9dQ-3R-rf8" secondAttribute="trailing" id="cUw-fP-nrT"/>
+                <constraint firstItem="4Ch-5s-yLs" firstAttribute="top" secondItem="aVc-V7-FBS" secondAttribute="top" id="dqA-pe-XXh"/>
+                <constraint firstItem="cRx-Wh-6fg" firstAttribute="top" secondItem="Qfb-JE-bUl" secondAttribute="bottom" id="e8S-28-z28"/>
+                <constraint firstAttribute="trailing" secondItem="cRx-Wh-6fg" secondAttribute="trailing" id="fF8-nb-gXa"/>
+                <constraint firstItem="a4J-25-yUn" firstAttribute="height" secondItem="4Ch-5s-yLs" secondAttribute="height" id="jeF-9a-y1X"/>
+                <constraint firstItem="9dQ-3R-rf8" firstAttribute="top" secondItem="4Ch-5s-yLs" secondAttribute="top" id="jmb-MX-BYB"/>
+                <constraint firstItem="9dQ-3R-rf8" firstAttribute="width" secondItem="4Ch-5s-yLs" secondAttribute="width" id="jyU-G1-Km1"/>
+                <constraint firstItem="a4J-25-yUn" firstAttribute="width" secondItem="4Ch-5s-yLs" secondAttribute="width" id="vgv-wZ-9HG"/>
+                <constraint firstItem="Skb-rC-s7k" firstAttribute="top" secondItem="Qfb-JE-bUl" secondAttribute="top" id="w47-rs-psP"/>
+                <constraint firstItem="Skb-rC-s7k" firstAttribute="trailing" secondItem="Qfb-JE-bUl" secondAttribute="trailing" id="wP1-Ht-0lf"/>
+                <constraint firstAttribute="trailing" secondItem="Qfb-JE-bUl" secondAttribute="trailing" id="ylu-aj-JD8"/>
+                <constraint firstAttribute="bottom" secondItem="Qfb-JE-bUl" secondAttribute="bottom" constant="60" id="z3z-OO-F8d"/>
+                <constraint firstItem="Skb-rC-s7k" firstAttribute="bottom" secondItem="Qfb-JE-bUl" secondAttribute="bottom" id="zC7-li-rar"/>
+            </constraints>
+            <point key="canvasLocation" x="260.5" y="299.5"/>
+        </customView>
+        <customView id="3V9-UO-YC8">
+            <rect key="frame" x="0.0" y="0.0" width="237" height="86"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
+            <subviews>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w8O-ky-GkI">
+                    <rect key="frame" x="14" y="49" width="18" height="18"/>
+                    <buttonCell key="cell" type="check" title="Button" bezelStyle="regularSquare" imagePosition="only" state="on" inset="2" id="aHX-l2-uDA">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="14" id="BfP-0t-bwZ"/>
+                        <constraint firstAttribute="height" constant="14" id="ujc-2v-pXa"/>
+                    </constraints>
+                    <connections>
+                        <action selector="dynamicStampButtonItemClicked_Author:" target="-2" id="QwQ-s3-kqw"/>
+                    </connections>
+                </button>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nfe-06-8Hb">
+                    <rect key="frame" x="30" y="51" width="35" height="15"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="8fp-iH-M5S">
+                        <font key="font" metaFont="cellTitle"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Cf3-ij-TW3">
+                    <rect key="frame" x="71" y="48" width="162" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="162" id="InN-b8-goi"/>
+                        <constraint firstAttribute="height" constant="20" id="xZv-8N-dCy"/>
+                    </constraints>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" drawsBackground="YES" id="6rH-dz-04d">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CiP-Jz-Xdn">
+                    <rect key="frame" x="30" y="18" width="35" height="15"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="VD2-sn-eiH">
+                        <font key="font" metaFont="cellTitle"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="j61-6m-eFB">
+                    <rect key="frame" x="71" y="14" width="162" height="22"/>
+                    <view key="contentView" id="uG6-E9-Enl">
+                        <rect key="frame" x="1" y="1" width="160" height="20"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wtD-Vt-js7" customClass="KMComboBox" customModule="PDF_Master" customModuleProvider="target">
+                                <rect key="frame" x="-1" y="-2" width="164" height="23"/>
+                                <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" buttonBordered="NO" completes="NO" numberOfVisibleItems="5" id="oR8-Eg-1Mn" customClass="KMStampComboBoxCell">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <objectValues>
+                                        <string>Item 1</string>
+                                        <string>Item 2</string>
+                                        <string>Item 3</string>
+                                    </objectValues>
+                                </comboBoxCell>
+                            </comboBox>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="wtD-Vt-js7" firstAttribute="leading" secondItem="uG6-E9-Enl" secondAttribute="leading" id="3vz-32-0Ld"/>
+                            <constraint firstItem="wtD-Vt-js7" firstAttribute="top" secondItem="uG6-E9-Enl" secondAttribute="top" id="IHa-MM-17v"/>
+                            <constraint firstAttribute="trailing" secondItem="wtD-Vt-js7" secondAttribute="trailing" id="Vm4-Iz-Xji"/>
+                            <constraint firstAttribute="bottom" secondItem="wtD-Vt-js7" secondAttribute="bottom" id="yAV-gL-RsM"/>
+                        </constraints>
+                    </view>
+                </box>
+            </subviews>
+            <constraints>
+                <constraint firstItem="CiP-Jz-Xdn" firstAttribute="leading" secondItem="nfe-06-8Hb" secondAttribute="leading" id="3MG-Pw-C7h"/>
+                <constraint firstItem="w8O-ky-GkI" firstAttribute="top" secondItem="3V9-UO-YC8" secondAttribute="top" constant="21" id="DeA-sp-YQg"/>
+                <constraint firstItem="nfe-06-8Hb" firstAttribute="centerY" secondItem="w8O-ky-GkI" secondAttribute="centerY" id="Ept-8p-IYX"/>
+                <constraint firstItem="Cf3-ij-TW3" firstAttribute="centerY" secondItem="w8O-ky-GkI" secondAttribute="centerY" id="GRl-ed-rdN"/>
+                <constraint firstItem="j61-6m-eFB" firstAttribute="centerY" secondItem="CiP-Jz-Xdn" secondAttribute="centerY" id="OCr-Gs-wt3"/>
+                <constraint firstItem="j61-6m-eFB" firstAttribute="leading" secondItem="Cf3-ij-TW3" secondAttribute="leading" id="QBr-Kt-0Fr"/>
+                <constraint firstItem="Cf3-ij-TW3" firstAttribute="leading" secondItem="nfe-06-8Hb" secondAttribute="trailing" constant="8" id="a0s-M5-P30"/>
+                <constraint firstItem="w8O-ky-GkI" firstAttribute="leading" secondItem="3V9-UO-YC8" secondAttribute="leading" constant="16" id="kpd-KL-XfS"/>
+                <constraint firstItem="j61-6m-eFB" firstAttribute="trailing" secondItem="Cf3-ij-TW3" secondAttribute="trailing" id="nQR-jd-Dcj"/>
+                <constraint firstItem="j61-6m-eFB" firstAttribute="top" secondItem="Cf3-ij-TW3" secondAttribute="bottom" constant="12" id="oGn-xV-A78"/>
+                <constraint firstItem="nfe-06-8Hb" firstAttribute="leading" secondItem="w8O-ky-GkI" secondAttribute="trailing" constant="2" id="qGA-TW-KLv"/>
+            </constraints>
+            <point key="canvasLocation" x="546.5" y="551"/>
+        </customView>
+        <customView id="RNY-Tv-xZx">
+            <rect key="frame" x="0.0" y="0.0" width="237" height="60"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
+            <subviews>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="bRx-2b-FgS">
+                    <rect key="frame" x="0.0" y="0.0" width="119" height="60"/>
                     <subviews>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="h5c-oD-e3y">
-                            <rect key="frame" x="1" y="1" width="69" height="30"/>
-                            <buttonCell key="cell" type="bevel" title="Standard" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="hmk-Iv-VxW">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="standardoneButton_Click:" target="-2" id="9bf-Dj-OYd"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qOe-3d-iez">
-                            <rect key="frame" x="71" y="1" width="70" height="30"/>
-                            <buttonCell key="cell" type="bevel" title="Standard" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="tb7-Qe-kbp">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="standardtwoButton_Click:" target="-2" id="NcY-qj-gKP"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cfq-dz-U2H">
-                            <rect key="frame" x="142" y="1" width="65" height="30"/>
-                            <buttonCell key="cell" type="bevel" title="Standard" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="2gs-W2-tiD">
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zG5-2e-zz5">
+                            <rect key="frame" x="16" y="14" width="87" height="32"/>
+                            <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="1K0-9K-JFM">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="32" id="D43-Ug-Qhk"/>
+                            </constraints>
                             <connections>
-                                <action selector="standardthreeButton_Click:" target="-2" id="La2-i2-Tpv"/>
+                                <action selector="imageStampButtonAction:" target="-2" id="Cmx-Bb-iBN"/>
                             </connections>
                         </button>
                     </subviews>
                     <constraints>
-                        <constraint firstAttribute="height" constant="32" id="2mz-jM-8sF"/>
-                        <constraint firstAttribute="bottom" secondItem="h5c-oD-e3y" secondAttribute="bottom" constant="1" id="DXu-mo-q8e"/>
-                        <constraint firstItem="qOe-3d-iez" firstAttribute="bottom" secondItem="h5c-oD-e3y" secondAttribute="bottom" id="GiK-gN-Byz"/>
-                        <constraint firstItem="qOe-3d-iez" firstAttribute="leading" secondItem="h5c-oD-e3y" secondAttribute="trailing" constant="1" id="KLQ-V6-YCz"/>
-                        <constraint firstItem="h5c-oD-e3y" firstAttribute="width" secondItem="rcW-g0-ndG" secondAttribute="width" multiplier="0.33333" id="MxJ-jj-p8B"/>
-                        <constraint firstAttribute="trailing" secondItem="cfq-dz-U2H" secondAttribute="trailing" constant="1" id="XdT-Mw-NmY"/>
-                        <constraint firstItem="h5c-oD-e3y" firstAttribute="leading" secondItem="rcW-g0-ndG" secondAttribute="leading" constant="1" id="dCq-Zq-jVv"/>
-                        <constraint firstItem="cfq-dz-U2H" firstAttribute="top" secondItem="rcW-g0-ndG" secondAttribute="top" constant="1" id="sy3-8h-7NH"/>
-                        <constraint firstItem="qOe-3d-iez" firstAttribute="top" secondItem="rcW-g0-ndG" secondAttribute="top" constant="1" id="tmN-K8-9zD"/>
-                        <constraint firstItem="qOe-3d-iez" firstAttribute="width" secondItem="h5c-oD-e3y" secondAttribute="width" id="uQq-QH-Jbf"/>
-                        <constraint firstItem="cfq-dz-U2H" firstAttribute="bottom" secondItem="qOe-3d-iez" secondAttribute="bottom" id="uTh-7g-N3k"/>
-                        <constraint firstItem="cfq-dz-U2H" firstAttribute="leading" secondItem="qOe-3d-iez" secondAttribute="trailing" constant="1" id="wCO-Zd-WaP"/>
-                        <constraint firstItem="h5c-oD-e3y" firstAttribute="top" secondItem="rcW-g0-ndG" secondAttribute="top" constant="1" id="yj3-Pa-otl"/>
+                        <constraint firstAttribute="trailing" relation="lessThanOrEqual" secondItem="zG5-2e-zz5" secondAttribute="trailing" constant="16" id="1K9-5R-0RF"/>
+                        <constraint firstItem="zG5-2e-zz5" firstAttribute="centerY" secondItem="bRx-2b-FgS" secondAttribute="centerY" id="PXv-Hq-M9M"/>
+                        <constraint firstItem="zG5-2e-zz5" firstAttribute="leading" relation="lessThanOrEqual" secondItem="bRx-2b-FgS" secondAttribute="leading" constant="16" id="yWl-4d-kqo"/>
                     </constraints>
                 </customView>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="HpP-MC-7Ak">
-                    <rect key="frame" x="0.0" y="367" width="208" height="40"/>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="gkP-AQ-ZUd">
+                    <rect key="frame" x="119" y="0.0" width="118" height="60"/>
                     <subviews>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Svb-0E-Z6j">
-                            <rect key="frame" x="8" y="12" width="45" height="17"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" title="stamp" id="HNF-ga-GQb">
-                                <font key="font" metaFont="system" size="14"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="52c-SM-Dav">
-                            <rect key="frame" x="178" y="10" width="20" height="20"/>
-                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameMainToolbarUp" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="9a7-zs-pZR">
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="16J-eB-gZj">
+                            <rect key="frame" x="16" y="14" width="86" height="32"/>
+                            <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="5ZG-YB-9Bz">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="32" id="MJd-0t-v1r"/>
+                            </constraints>
                             <connections>
-                                <action selector="addStampButton_Click:" target="-2" id="aDD-r5-54g"/>
+                                <action selector="textStampButtonAction:" target="-2" id="jl5-YH-6q8"/>
                             </connections>
                         </button>
                     </subviews>
                     <constraints>
-                        <constraint firstAttribute="height" constant="40" id="6Mo-Q3-gfZ"/>
-                        <constraint firstAttribute="trailing" secondItem="52c-SM-Dav" secondAttribute="trailing" constant="10" id="Mcg-h1-RBW"/>
-                        <constraint firstItem="Svb-0E-Z6j" firstAttribute="leading" secondItem="HpP-MC-7Ak" secondAttribute="leading" constant="10" id="TcY-Rl-wOp"/>
-                        <constraint firstItem="Svb-0E-Z6j" firstAttribute="centerY" secondItem="HpP-MC-7Ak" secondAttribute="centerY" id="hlN-iz-wpI"/>
-                        <constraint firstItem="52c-SM-Dav" firstAttribute="centerY" secondItem="Svb-0E-Z6j" secondAttribute="centerY" id="wyl-RA-dyf"/>
+                        <constraint firstItem="16J-eB-gZj" firstAttribute="leading" relation="lessThanOrEqual" secondItem="gkP-AQ-ZUd" secondAttribute="leading" constant="16" id="gTr-Se-mmp"/>
+                        <constraint firstItem="16J-eB-gZj" firstAttribute="centerY" secondItem="gkP-AQ-ZUd" secondAttribute="centerY" id="h46-Vu-Ehn"/>
+                        <constraint firstAttribute="trailing" relation="lessThanOrEqual" secondItem="16J-eB-gZj" secondAttribute="trailing" constant="16" id="qCC-Lq-Cwp"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="HpP-MC-7Ak" secondAttribute="trailing" id="4S2-r4-BCf"/>
-                <constraint firstItem="lIb-6B-0XZ" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="5eb-T1-8GZ"/>
-                <constraint firstItem="rcW-g0-ndG" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="-32" id="8zc-fQ-oru"/>
-                <constraint firstItem="HpP-MC-7Ak" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="Lpz-cs-4Ux"/>
-                <constraint firstAttribute="bottom" secondItem="lIb-6B-0XZ" secondAttribute="bottom" id="YyL-fS-40y"/>
-                <constraint firstItem="rcW-g0-ndG" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="bzG-Wi-e4k"/>
-                <constraint firstAttribute="trailing" secondItem="rcW-g0-ndG" secondAttribute="trailing" id="eAQ-m7-tk9"/>
-                <constraint firstItem="HpP-MC-7Ak" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="evn-n7-BPk"/>
-                <constraint firstItem="lIb-6B-0XZ" firstAttribute="top" secondItem="rcW-g0-ndG" secondAttribute="bottom" constant="42" id="j5O-4l-BSr"/>
-                <constraint firstAttribute="trailing" secondItem="lIb-6B-0XZ" secondAttribute="trailing" id="rbq-qe-JhA"/>
+                <constraint firstAttribute="bottom" secondItem="gkP-AQ-ZUd" secondAttribute="bottom" id="IUm-Sd-sMV"/>
+                <constraint firstItem="gkP-AQ-ZUd" firstAttribute="top" secondItem="RNY-Tv-xZx" secondAttribute="top" id="c1p-yO-IUP"/>
+                <constraint firstItem="bRx-2b-FgS" firstAttribute="leading" secondItem="RNY-Tv-xZx" secondAttribute="leading" id="ibP-ql-H3F"/>
+                <constraint firstItem="gkP-AQ-ZUd" firstAttribute="width" secondItem="bRx-2b-FgS" secondAttribute="width" id="kcz-ij-hfx"/>
+                <constraint firstItem="bRx-2b-FgS" firstAttribute="width" secondItem="RNY-Tv-xZx" secondAttribute="width" multiplier="0.5" id="qTa-WI-6Tt"/>
+                <constraint firstAttribute="trailing" secondItem="gkP-AQ-ZUd" secondAttribute="trailing" id="wtj-JN-xac"/>
+                <constraint firstAttribute="bottom" secondItem="bRx-2b-FgS" secondAttribute="bottom" id="ybb-s2-3YQ"/>
+                <constraint firstItem="bRx-2b-FgS" firstAttribute="top" secondItem="RNY-Tv-xZx" secondAttribute="top" id="yc1-sZ-fGe"/>
             </constraints>
-            <point key="canvasLocation" x="401" y="377.5"/>
+            <point key="canvasLocation" x="831.5" y="569"/>
         </customView>
-        <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="MLc-uU-v8f">
-            <rect key="frame" x="0.0" y="0.0" width="250" height="599"/>
+        <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="XkM-hI-Z6Q">
+            <rect key="frame" x="0.0" y="0.0" width="262" height="599"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
-            <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="5gp-pt-VnO">
-                <rect key="frame" x="1" y="1" width="248" height="597"/>
-                <autoresizingMask key="autoresizingMask"/>
+            <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="NDK-ok-tvh">
+                <rect key="frame" x="1" y="1" width="260" height="597"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <view id="qKf-ge-VzH">
+                    <view id="Aj7-0M-710">
                         <rect key="frame" x="0.0" y="0.0" width="245" height="582"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="FSa-kq-l83">
-                                <rect key="frame" x="16" y="462" width="213" height="80"/>
-                                <view key="contentView" id="bBG-qw-FI3">
+                            <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="boX-w4-4Qf">
+                                <rect key="frame" x="16" y="502" width="213" height="80"/>
+                                <view key="contentView" id="0nI-f1-DBl">
                                     <rect key="frame" x="0.0" y="0.0" width="213" height="80"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="92q-eX-E7j">
+                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="EEJ-mI-fRi">
                                             <rect key="frame" x="20" y="16" width="173" height="48"/>
-                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="dhe-Ps-v4X"/>
+                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="GgB-kh-ZUo"/>
                                         </imageView>
                                     </subviews>
                                     <constraints>
-                                        <constraint firstItem="92q-eX-E7j" firstAttribute="leading" secondItem="bBG-qw-FI3" secondAttribute="leading" constant="20" id="2yH-3e-RSj"/>
-                                        <constraint firstItem="92q-eX-E7j" firstAttribute="top" secondItem="bBG-qw-FI3" secondAttribute="top" constant="16" id="Idn-1D-aDN"/>
-                                        <constraint firstAttribute="trailing" secondItem="92q-eX-E7j" secondAttribute="trailing" constant="20" id="O4R-C0-icw"/>
-                                        <constraint firstAttribute="bottom" secondItem="92q-eX-E7j" secondAttribute="bottom" constant="16" id="RIc-n8-EQ6"/>
+                                        <constraint firstAttribute="bottom" secondItem="EEJ-mI-fRi" secondAttribute="bottom" constant="16" id="LbD-VE-8bc"/>
+                                        <constraint firstItem="EEJ-mI-fRi" firstAttribute="top" secondItem="0nI-f1-DBl" secondAttribute="top" constant="16" id="jjb-w1-X3v"/>
+                                        <constraint firstAttribute="trailing" secondItem="EEJ-mI-fRi" secondAttribute="trailing" constant="20" id="lMH-pg-L5E"/>
+                                        <constraint firstItem="EEJ-mI-fRi" firstAttribute="leading" secondItem="0nI-f1-DBl" secondAttribute="leading" constant="20" id="v6j-56-ziO"/>
                                     </constraints>
                                 </view>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="80" id="0t6-k0-MYu"/>
-                                    <constraint firstAttribute="width" constant="213" id="4mw-uk-wKf"/>
+                                    <constraint firstAttribute="height" constant="80" id="kLj-qP-zeQ"/>
                                 </constraints>
                                 <color key="fillColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </box>
-                            <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="g0Y-OE-5sV">
-                                <rect key="frame" x="16" y="414" width="213" height="32"/>
-                                <view key="contentView" hidden="YES" id="qny-QN-Xbw">
-                                    <rect key="frame" x="0.0" y="0.0" width="213" height="32"/>
+                            <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="JXe-4Q-gCs">
+                                <rect key="frame" x="16" y="342" width="213" height="64"/>
+                                <view key="contentView" id="kRl-pI-Ztq">
+                                    <rect key="frame" x="0.0" y="0.0" width="213" height="64"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nBG-3i-iym">
-                                            <rect key="frame" x="0.0" y="0.0" width="102" height="32"/>
-                                            <buttonCell key="cell" type="bevel" title="Clockwise rotation" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="vzD-ay-QqY">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system" size="10"/>
-                                            </buttonCell>
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tKZ-fa-8Ft">
+                                            <rect key="frame" x="-2" y="34" width="217" height="20"/>
                                             <constraints>
-                                                <constraint firstAttribute="height" constant="32" id="12N-L9-yNh"/>
+                                                <constraint firstAttribute="height" constant="20" id="FJF-i6-gOD"/>
                                             </constraints>
-                                            <connections>
-                                                <action selector="rightRotationButton_Click:" target="-2" id="C1Z-zw-4ed"/>
-                                            </connections>
-                                        </button>
-                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="z8p-I5-cAT">
-                                            <rect key="frame" x="123" y="0.0" width="90" height="32"/>
-                                            <buttonCell key="cell" type="bevel" title="Counterclockwise rotation" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="fEu-SR-gYj">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system" size="10"/>
-                                            </buttonCell>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="8Tn-WN-il9">
+                                                <font key="font" metaFont="systemBold" size="14"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="6Vm-3i-iSJ" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                                            <rect key="frame" x="0.0" y="0.0" width="69" height="24"/>
+                                            <view key="contentView" id="iFy-rI-1HW">
+                                                <rect key="frame" x="1" y="1" width="67" height="22"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <subviews>
+                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="awq-J6-Rn6">
+                                                        <rect key="frame" x="0.0" y="0.0" width="67" height="22"/>
+                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" image="KMImageNameUXIconPropertybarRotateClockwiseNor" id="ogY-Uu-Vdy"/>
+                                                    </imageView>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="awq-J6-Rn6" firstAttribute="top" secondItem="iFy-rI-1HW" secondAttribute="top" id="6nc-hI-LZI"/>
+                                                    <constraint firstAttribute="trailing" secondItem="awq-J6-Rn6" secondAttribute="trailing" id="H3G-6V-Mah"/>
+                                                    <constraint firstItem="awq-J6-Rn6" firstAttribute="leading" secondItem="iFy-rI-1HW" secondAttribute="leading" id="LUu-Iu-dcs"/>
+                                                    <constraint firstAttribute="bottom" secondItem="awq-J6-Rn6" secondAttribute="bottom" id="T5l-Ai-pZm"/>
+                                                </constraints>
+                                            </view>
                                             <constraints>
-                                                <constraint firstAttribute="height" constant="32" id="jDb-1f-KSH"/>
+                                                <constraint firstAttribute="height" constant="24" id="fxh-v9-73C"/>
+                                                <constraint firstAttribute="width" constant="69" id="z7x-p4-WCk"/>
                                             </constraints>
+                                        </box>
+                                        <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Nf2-e7-zm4" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                                            <rect key="frame" x="78" y="0.0" width="69" height="24"/>
+                                            <view key="contentView" id="5Kl-Jf-ges">
+                                                <rect key="frame" x="1" y="1" width="67" height="22"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <subviews>
+                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xeG-af-M7X">
+                                                        <rect key="frame" x="0.0" y="0.0" width="67" height="22"/>
+                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" image="KMImageNameUXIconPropertybarRotateCounterclockwiseNor" id="zoB-t7-OW8"/>
+                                                    </imageView>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="trailing" secondItem="xeG-af-M7X" secondAttribute="trailing" id="6tl-3W-Xhr"/>
+                                                    <constraint firstAttribute="bottom" secondItem="xeG-af-M7X" secondAttribute="bottom" id="Kps-ai-fha"/>
+                                                    <constraint firstItem="xeG-af-M7X" firstAttribute="top" secondItem="5Kl-Jf-ges" secondAttribute="top" id="Xjj-lk-PTI"/>
+                                                    <constraint firstItem="xeG-af-M7X" firstAttribute="leading" secondItem="5Kl-Jf-ges" secondAttribute="leading" id="mfP-3v-XzR"/>
+                                                </constraints>
+                                            </view>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="24" id="AJ0-8L-bWi"/>
+                                                <constraint firstAttribute="width" constant="69" id="S6D-Ba-d2V"/>
+                                            </constraints>
+                                        </box>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="tKZ-fa-8Ft" firstAttribute="top" secondItem="kRl-pI-Ztq" secondAttribute="top" constant="10" id="0km-4R-ZOd"/>
+                                        <constraint firstItem="tKZ-fa-8Ft" firstAttribute="leading" secondItem="kRl-pI-Ztq" secondAttribute="leading" id="1xc-L9-TRg"/>
+                                        <constraint firstAttribute="bottom" secondItem="6Vm-3i-iSJ" secondAttribute="bottom" id="D4U-ge-oaX"/>
+                                        <constraint firstItem="Nf2-e7-zm4" firstAttribute="leading" secondItem="6Vm-3i-iSJ" secondAttribute="trailing" constant="9" id="E1D-zk-9Av"/>
+                                        <constraint firstAttribute="bottom" secondItem="Nf2-e7-zm4" secondAttribute="bottom" id="Imi-62-qrb"/>
+                                        <constraint firstItem="6Vm-3i-iSJ" firstAttribute="leading" secondItem="kRl-pI-Ztq" secondAttribute="leading" id="QuA-7H-dka"/>
+                                        <constraint firstAttribute="trailing" secondItem="tKZ-fa-8Ft" secondAttribute="trailing" id="euV-FG-M5p"/>
+                                    </constraints>
+                                </view>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="64" id="Ypd-yB-mdT"/>
+                                </constraints>
+                            </box>
+                            <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="IFI-8g-CYh">
+                                <rect key="frame" x="16" y="0.0" width="213" height="326"/>
+                                <view key="contentView" id="9qa-Oq-oOt">
+                                    <rect key="frame" x="0.0" y="0.0" width="213" height="326"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UsV-0m-nUC">
+                                            <rect key="frame" x="-2" y="296" width="42" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="20" id="Qva-NE-D5a"/>
+                                            </constraints>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="VHY-hZ-E8p">
+                                                <font key="font" metaFont="systemBold" size="14"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="43Y-Fz-EW6">
+                                            <rect key="frame" x="0.0" y="176" width="213" height="110"/>
+                                            <clipView key="contentView" drawsBackground="NO" id="wcx-5m-Dzd">
+                                                <rect key="frame" x="0.0" y="0.0" width="213" height="110"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <subviews>
+                                                    <textView importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="lq6-MU-1hZ">
+                                                        <rect key="frame" x="0.0" y="0.0" width="213" height="110"/>
+                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        <size key="minSize" width="213" height="110"/>
+                                                        <size key="maxSize" width="463" height="10000000"/>
+                                                        <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                    </textView>
+                                                </subviews>
+                                            </clipView>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="110" id="bVo-dx-ENY"/>
+                                            </constraints>
+                                            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="p3Y-Bi-OxR">
+                                                <rect key="frame" x="-100" y="-100" width="87" height="18"/>
+                                                <autoresizingMask key="autoresizingMask"/>
+                                            </scroller>
+                                            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="kch-yq-sCJ">
+                                                <rect key="frame" x="222" y="1" width="15" height="98"/>
+                                                <autoresizingMask key="autoresizingMask"/>
+                                            </scroller>
+                                        </scrollView>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="UsV-0m-nUC" firstAttribute="top" secondItem="9qa-Oq-oOt" secondAttribute="top" constant="10" id="DSE-bq-UGv"/>
+                                        <constraint firstItem="43Y-Fz-EW6" firstAttribute="leading" secondItem="9qa-Oq-oOt" secondAttribute="leading" id="Huk-aL-QnI"/>
+                                        <constraint firstAttribute="trailing" secondItem="43Y-Fz-EW6" secondAttribute="trailing" id="Yrl-8a-Omy"/>
+                                        <constraint firstItem="UsV-0m-nUC" firstAttribute="leading" secondItem="9qa-Oq-oOt" secondAttribute="leading" id="a0J-FD-Dc3"/>
+                                        <constraint firstItem="43Y-Fz-EW6" firstAttribute="top" secondItem="UsV-0m-nUC" secondAttribute="bottom" constant="10" id="ycg-uh-lrX"/>
+                                    </constraints>
+                                </view>
+                            </box>
+                            <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="22t-Qb-mZk">
+                                <rect key="frame" x="16" y="422" width="213" height="64"/>
+                                <view key="contentView" id="1UJ-gh-uAB">
+                                    <rect key="frame" x="0.0" y="0.0" width="213" height="64"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="clF-X8-CfE">
+                                            <rect key="frame" x="140" y="-2" width="76" height="27"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="24" id="6Gi-XH-APf"/>
+                                                <constraint firstAttribute="width" constant="72" id="LQZ-Vw-rg8"/>
+                                            </constraints>
+                                            <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" focusRingType="none" alignment="center" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="VyB-xV-8Cm">
+                                                <font key="font" metaFont="cellTitle"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                <objectValues>
+                                                    <string>25%</string>
+                                                    <string>50%</string>
+                                                    <string>75%</string>
+                                                    <string>100%</string>
+                                                </objectValues>
+                                            </comboBoxCell>
+                                            <connections>
+                                                <action selector="opacityComboBoxAction:" target="-2" id="d35-kf-uWc"/>
+                                            </connections>
+                                        </comboBox>
+                                        <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cXF-Rh-krb">
+                                            <rect key="frame" x="-2" y="-4" width="137" height="28"/>
+                                            <sliderCell key="cell" alignment="left" maxValue="1" doubleValue="1" tickMarkPosition="above" sliderType="linear" id="yBZ-BU-cbc"/>
                                             <connections>
-                                                <action selector="leftRotationButton_Click:" target="-2" id="wo7-xg-zsp"/>
+                                                <action selector="opacitySliderAction:" target="-2" id="mik-d8-oIH"/>
                                             </connections>
-                                        </button>
+                                        </slider>
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dl7-N2-sZY">
+                                            <rect key="frame" x="-2" y="32" width="42" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="20" id="0vB-EP-csS"/>
+                                            </constraints>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="UUu-MT-Yxq">
+                                                <font key="font" metaFont="systemBold" size="14"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
                                     </subviews>
                                     <constraints>
-                                        <constraint firstItem="nBG-3i-iym" firstAttribute="top" secondItem="qny-QN-Xbw" secondAttribute="top" id="63d-Le-dga"/>
-                                        <constraint firstAttribute="trailing" secondItem="z8p-I5-cAT" secondAttribute="trailing" id="679-Cl-5XY"/>
-                                        <constraint firstItem="nBG-3i-iym" firstAttribute="leading" secondItem="qny-QN-Xbw" secondAttribute="leading" id="jUf-Bu-Wk1"/>
-                                        <constraint firstItem="z8p-I5-cAT" firstAttribute="width" secondItem="nBG-3i-iym" secondAttribute="width" multiplier="0.878505" id="qtu-r6-EwI"/>
-                                        <constraint firstItem="z8p-I5-cAT" firstAttribute="top" secondItem="qny-QN-Xbw" secondAttribute="top" id="tQ1-ui-HBX"/>
-                                        <constraint firstItem="nBG-3i-iym" firstAttribute="width" secondItem="qny-QN-Xbw" secondAttribute="width" multiplier="0.48" id="yuK-6i-nGZ"/>
+                                        <constraint firstAttribute="bottom" secondItem="clF-X8-CfE" secondAttribute="bottom" id="1T8-fT-zLk"/>
+                                        <constraint firstItem="Dl7-N2-sZY" firstAttribute="leading" secondItem="1UJ-gh-uAB" secondAttribute="leading" id="2lo-GU-AOg"/>
+                                        <constraint firstItem="cXF-Rh-krb" firstAttribute="leading" secondItem="1UJ-gh-uAB" secondAttribute="leading" id="6ZA-XO-lst"/>
+                                        <constraint firstItem="clF-X8-CfE" firstAttribute="leading" secondItem="cXF-Rh-krb" secondAttribute="trailing" constant="8" id="F40-pY-Lg3"/>
+                                        <constraint firstItem="cXF-Rh-krb" firstAttribute="top" secondItem="Dl7-N2-sZY" secondAttribute="bottom" constant="10" id="ThK-Fj-NZN"/>
+                                        <constraint firstItem="clF-X8-CfE" firstAttribute="centerY" secondItem="cXF-Rh-krb" secondAttribute="centerY" id="cYK-46-QIW"/>
+                                        <constraint firstAttribute="trailing" secondItem="clF-X8-CfE" secondAttribute="trailing" id="vOx-fM-E4W"/>
                                     </constraints>
                                 </view>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="32" id="s1g-5C-CVa"/>
+                                    <constraint firstAttribute="height" constant="64" id="EHD-nQ-wUX"/>
                                 </constraints>
                             </box>
                         </subviews>
                         <constraints>
-                            <constraint firstItem="FSa-kq-l83" firstAttribute="leading" secondItem="qKf-ge-VzH" secondAttribute="leading" constant="16" id="1lb-fF-LN1"/>
-                            <constraint firstItem="g0Y-OE-5sV" firstAttribute="leading" secondItem="FSa-kq-l83" secondAttribute="leading" id="Ltu-oS-3bu"/>
-                            <constraint firstItem="FSa-kq-l83" firstAttribute="top" secondItem="qKf-ge-VzH" secondAttribute="top" constant="40" id="ZZc-Db-hfC"/>
-                            <constraint firstItem="g0Y-OE-5sV" firstAttribute="top" secondItem="FSa-kq-l83" secondAttribute="bottom" constant="16" id="bfD-dX-2mS"/>
-                            <constraint firstAttribute="trailing" secondItem="FSa-kq-l83" secondAttribute="trailing" constant="16" id="mqn-P4-Osc"/>
-                            <constraint firstItem="g0Y-OE-5sV" firstAttribute="trailing" secondItem="FSa-kq-l83" secondAttribute="trailing" id="qdc-b4-zY8"/>
+                            <constraint firstItem="IFI-8g-CYh" firstAttribute="trailing" secondItem="JXe-4Q-gCs" secondAttribute="trailing" id="K08-JC-OvB"/>
+                            <constraint firstAttribute="trailing" secondItem="boX-w4-4Qf" secondAttribute="trailing" constant="16" id="QHw-QM-9wK"/>
+                            <constraint firstItem="22t-Qb-mZk" firstAttribute="trailing" secondItem="boX-w4-4Qf" secondAttribute="trailing" id="Ucg-R8-zRX"/>
+                            <constraint firstItem="JXe-4Q-gCs" firstAttribute="leading" secondItem="boX-w4-4Qf" secondAttribute="leading" id="W8a-3b-uOL"/>
+                            <constraint firstItem="IFI-8g-CYh" firstAttribute="leading" secondItem="JXe-4Q-gCs" secondAttribute="leading" id="YVF-Jt-o7q"/>
+                            <constraint firstAttribute="bottom" secondItem="IFI-8g-CYh" secondAttribute="bottom" id="gDt-Qr-c3x"/>
+                            <constraint firstItem="JXe-4Q-gCs" firstAttribute="trailing" secondItem="boX-w4-4Qf" secondAttribute="trailing" id="gIC-lD-ahb"/>
+                            <constraint firstItem="boX-w4-4Qf" firstAttribute="top" secondItem="Aj7-0M-710" secondAttribute="top" id="pBr-G2-epf"/>
+                            <constraint firstItem="JXe-4Q-gCs" firstAttribute="top" secondItem="boX-w4-4Qf" secondAttribute="bottom" constant="96" id="qJi-l1-DIj"/>
+                            <constraint firstItem="boX-w4-4Qf" firstAttribute="leading" secondItem="Aj7-0M-710" secondAttribute="leading" constant="16" id="utC-v7-XFT"/>
+                            <constraint firstItem="22t-Qb-mZk" firstAttribute="top" secondItem="boX-w4-4Qf" secondAttribute="bottom" constant="16" id="yPc-dA-X0D"/>
+                            <constraint firstItem="22t-Qb-mZk" firstAttribute="leading" secondItem="boX-w4-4Qf" secondAttribute="leading" id="yUv-12-925"/>
+                            <constraint firstItem="IFI-8g-CYh" firstAttribute="top" secondItem="JXe-4Q-gCs" secondAttribute="bottom" constant="16" id="zAb-Qa-5cY"/>
                         </constraints>
                     </view>
                 </subviews>
             </clipView>
-            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="rkL-70-Kqe">
+            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="q4P-TA-L45">
                 <rect key="frame" x="-100" y="-100" width="239" height="15"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
-            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="IOM-Ny-4Di">
+            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="mBn-Iz-dD0">
                 <rect key="frame" x="246" y="1" width="15" height="597"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
-            <point key="canvasLocation" x="-1212" y="574.5"/>
+            <point key="canvasLocation" x="559" y="983.5"/>
         </scrollView>
-        <customView id="zuA-3M-c6K">
-            <rect key="frame" x="0.0" y="0.0" width="285" height="599"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+        <customView id="CpL-4i-FVy">
+            <rect key="frame" x="0.0" y="0.0" width="237" height="90"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
             <subviews>
-                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Nch-P7-fZj">
-                    <rect key="frame" x="0.0" y="0.0" width="285" height="599"/>
-                    <view key="contentView" id="OG0-Rf-eIb">
-                        <rect key="frame" x="0.0" y="0.0" width="285" height="599"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                </box>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XEv-5I-scI">
+                    <rect key="frame" x="16" y="29" width="205" height="32"/>
+                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="regularSquare" image="KMImageNameUXIconBtnAddWhite" imagePosition="left" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="lDJ-8r-ufg" customClass="KMButtomCell" customModule="PDF_Master" customModuleProvider="target">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="32" id="dMf-0k-px9"/>
+                    </constraints>
+                    <connections>
+                        <action selector="addButtonAction:" target="-2" id="McC-yk-WUV"/>
+                    </connections>
+                </button>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="Nch-P7-fZj" secondAttribute="trailing" id="JXc-wJ-5Gp"/>
-                <constraint firstAttribute="bottom" secondItem="Nch-P7-fZj" secondAttribute="bottom" id="a12-ON-pPX"/>
-                <constraint firstItem="Nch-P7-fZj" firstAttribute="top" secondItem="zuA-3M-c6K" secondAttribute="top" id="c6K-50-b5e"/>
-                <constraint firstItem="Nch-P7-fZj" firstAttribute="leading" secondItem="zuA-3M-c6K" secondAttribute="leading" id="f9w-Nz-NtK"/>
+                <constraint firstItem="XEv-5I-scI" firstAttribute="centerY" secondItem="CpL-4i-FVy" secondAttribute="centerY" id="6CZ-wl-KyP"/>
+                <constraint firstAttribute="trailing" secondItem="XEv-5I-scI" secondAttribute="trailing" constant="16" id="LYR-Zy-o0o"/>
+                <constraint firstItem="XEv-5I-scI" firstAttribute="leading" secondItem="CpL-4i-FVy" secondAttribute="leading" constant="16" id="S4v-cz-WX7"/>
             </constraints>
-            <point key="canvasLocation" x="-99.5" y="299.5"/>
+            <point key="canvasLocation" x="547" y="410"/>
         </customView>
     </objects>
     <resources>
-        <image name="KMImageNameMainToolbarUp" width="20" height="20"/>
-        <image name="KMImageNamePropertybarDeleteStamp" width="12" height="12"/>
+        <image name="KMImageNameEmptyStamp" width="140" height="140"/>
+        <image name="KMImageNameUXIconBtnAddWhite" width="16" height="16"/>
+        <image name="KMImageNameUXIconBtnCloseNor" width="16" height="16"/>
+        <image name="KMImageNameUXIconPropertybarRotateClockwiseNor" width="20" height="20"/>
+        <image name="KMImageNameUXIconPropertybarRotateCounterclockwiseNor" width="20" height="20"/>
     </resources>
 </document>

+ 96 - 95
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMCustomizeStampViewController.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -35,7 +36,7 @@
             <rect key="frame" x="0.0" y="0.0" width="378" height="343"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7mu-SC-Ah8">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7mu-SC-Ah8">
                     <rect key="frame" x="13" y="312" width="74" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="New Stamp" id="RMQ-Ju-Sp2">
                         <font key="font" usesAppearanceFont="YES"/>
@@ -49,11 +50,11 @@
                 <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="GKG-UM-Zfb">
                     <rect key="frame" x="27" y="237" width="324" height="46"/>
                     <view key="contentView" id="UNf-az-8zB">
-                        <rect key="frame" x="3" y="3" width="318" height="40"/>
+                        <rect key="frame" x="4" y="5" width="316" height="38"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mmA-gH-boM">
-                                <rect key="frame" x="0.0" y="3" width="159" height="37"/>
+                                <rect key="frame" x="0.0" y="3" width="158" height="35"/>
                                 <buttonCell key="cell" type="bevel" title="Text Stamp" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Sha-gH-eRW">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -63,13 +64,13 @@
                                 </connections>
                             </button>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="h7i-TG-AHz">
-                                <rect key="frame" x="0.0" y="0.0" width="159" height="3"/>
+                                <rect key="frame" x="0.0" y="0.0" width="158" height="3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="3" id="2fy-27-I8D"/>
                                 </constraints>
                             </customView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ABE-yw-dWd">
-                                <rect key="frame" x="159" y="3" width="159" height="37"/>
+                                <rect key="frame" x="158" y="3" width="158" height="35"/>
                                 <buttonCell key="cell" type="bevel" title="Image Stamp" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="CXf-6q-PhP">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -98,9 +99,9 @@
                     </constraints>
                 </box>
                 <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="lBO-ea-4YE">
-                    <rect key="frame" x="7" y="54" width="364" height="179"/>
+                    <rect key="frame" x="10" y="58" width="358" height="173"/>
                     <view key="contentView" id="N7Y-Q2-RaB">
-                        <rect key="frame" x="0.0" y="0.0" width="364" height="179"/>
+                        <rect key="frame" x="0.0" y="0.0" width="358" height="173"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     </view>
                     <constraints>
@@ -164,19 +165,19 @@ Gw
                 <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Le4-nu-TzQ">
                     <rect key="frame" x="7" y="71" width="344" height="94"/>
                     <view key="contentView" id="4ZG-Hs-G9z">
-                        <rect key="frame" x="3" y="3" width="338" height="88"/>
+                        <rect key="frame" x="4" y="5" width="336" height="86"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YdI-Zl-i7q">
-                                <rect key="frame" x="0.0" y="37" width="338" height="16"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YdI-Zl-i7q">
+                                <rect key="frame" x="0.0" y="37" width="336" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="Stamp Text" drawsBackground="YES" id="e8l-Wv-ls8">
                                     <font key="font" usesAppearanceFont="YES"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dKj-JI-wt8">
-                                <rect key="frame" x="0.0" y="24" width="338" height="13"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dKj-JI-wt8">
+                                <rect key="frame" x="0.0" y="24" width="336" height="13"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="Stamp Text" drawsBackground="YES" id="AXj-OW-hjJ">
                                     <font key="font" metaFont="system" size="10"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -198,164 +199,164 @@ Gw
                         <constraint firstAttribute="height" constant="88" id="sk1-wk-VHC"/>
                     </constraints>
                 </box>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jao-ve-9UP">
-                    <rect key="frame" x="8" y="44" width="40" height="16"/>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jao-ve-9UP">
+                    <rect key="frame" x="9" y="44" width="40" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Stype" id="fiz-2U-bZt">
                         <font key="font" usesAppearanceFont="YES"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="jYD-a2-U4T">
-                    <rect key="frame" x="54" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="18" id="Hol-Qp-nn7"/>
-                        <constraint firstAttribute="height" constant="18" id="Pri-Le-exp"/>
-                    </constraints>
+                <button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jYD-a2-U4T">
+                    <rect key="frame" x="55" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp1" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="a6O-pl-wiV">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="Hol-Qp-nn7"/>
+                        <constraint firstAttribute="height" constant="18" id="Pri-Le-exp"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="psA-EZ-xcz"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="tck-dO-dSW">
-                    <rect key="frame" x="80" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="kB0-5R-IUr"/>
-                        <constraint firstAttribute="width" constant="18" id="wI4-GT-Kpj"/>
-                    </constraints>
+                <button tag="2" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tck-dO-dSW">
+                    <rect key="frame" x="81" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp2" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="6Lw-AF-Fxd">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="kB0-5R-IUr"/>
+                        <constraint firstAttribute="width" constant="18" id="wI4-GT-Kpj"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="LfP-XX-yrS"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="6ZC-ge-vPv">
-                    <rect key="frame" x="106" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="D2A-cB-Wc6"/>
-                        <constraint firstAttribute="width" constant="18" id="e8O-WS-n9w"/>
-                    </constraints>
+                <button tag="3" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6ZC-ge-vPv">
+                    <rect key="frame" x="107" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp3" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="fK5-JI-jcT">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="D2A-cB-Wc6"/>
+                        <constraint firstAttribute="width" constant="18" id="e8O-WS-n9w"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="joo-Fp-Ivh"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="KYW-Dy-lC0">
-                    <rect key="frame" x="132" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="CW0-gE-7qt"/>
-                        <constraint firstAttribute="width" constant="18" id="iEb-kr-yZI"/>
-                    </constraints>
+                <button tag="4" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KYW-Dy-lC0">
+                    <rect key="frame" x="133" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp4" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="zs1-iq-ifc">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="CW0-gE-7qt"/>
+                        <constraint firstAttribute="width" constant="18" id="iEb-kr-yZI"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="KMO-Vw-ePY"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="pMv-wo-uq1">
-                    <rect key="frame" x="158" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="18" id="gjw-3g-7HE"/>
-                        <constraint firstAttribute="height" constant="18" id="yPS-VV-6iA"/>
-                    </constraints>
+                <button tag="5" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pMv-wo-uq1">
+                    <rect key="frame" x="159" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp5" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="dcQ-ZV-HWp">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="gjw-3g-7HE"/>
+                        <constraint firstAttribute="height" constant="18" id="yPS-VV-6iA"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="9JK-d2-ycT"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="6" translatesAutoresizingMaskIntoConstraints="NO" id="ZE8-gp-HVS">
-                    <rect key="frame" x="184" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="0Qs-xh-5ae"/>
-                        <constraint firstAttribute="width" constant="18" id="f7L-ko-tbI"/>
-                    </constraints>
+                <button tag="6" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZE8-gp-HVS">
+                    <rect key="frame" x="185" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp6" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="ezQ-yb-OFF">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="0Qs-xh-5ae"/>
+                        <constraint firstAttribute="width" constant="18" id="f7L-ko-tbI"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="Teg-nP-MkU"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="jEA-O9-yI1">
-                    <rect key="frame" x="210" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="dYi-sN-ygR"/>
-                        <constraint firstAttribute="width" constant="18" id="m5C-iX-brh"/>
-                    </constraints>
+                <button tag="7" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jEA-O9-yI1">
+                    <rect key="frame" x="211" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp7" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="fkp-2H-wkY">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="dYi-sN-ygR"/>
+                        <constraint firstAttribute="width" constant="18" id="m5C-iX-brh"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="DFG-AH-BdA"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="8" translatesAutoresizingMaskIntoConstraints="NO" id="aKM-vb-hTB">
-                    <rect key="frame" x="236" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="HUT-AK-E1h"/>
-                        <constraint firstAttribute="width" constant="18" id="nld-Q6-xrS"/>
-                    </constraints>
+                <button tag="8" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aKM-vb-hTB">
+                    <rect key="frame" x="237" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp8" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="5w7-nZ-F4L">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="HUT-AK-E1h"/>
+                        <constraint firstAttribute="width" constant="18" id="nld-Q6-xrS"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="CPh-Jk-6T7"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="9" translatesAutoresizingMaskIntoConstraints="NO" id="CKW-of-DHj">
-                    <rect key="frame" x="262" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="18" id="AVo-OH-rsc"/>
-                        <constraint firstAttribute="height" constant="18" id="tPN-c2-smp"/>
-                    </constraints>
+                <button tag="9" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CKW-of-DHj">
+                    <rect key="frame" x="263" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp9" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Xp8-It-uzA">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="AVo-OH-rsc"/>
+                        <constraint firstAttribute="height" constant="18" id="tPN-c2-smp"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="ehj-ol-QhI"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="10" translatesAutoresizingMaskIntoConstraints="NO" id="HAt-8V-MUY">
-                    <rect key="frame" x="288" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="18" id="0hI-oI-fpk"/>
-                        <constraint firstAttribute="height" constant="18" id="FHx-HL-Iiw"/>
-                    </constraints>
+                <button tag="10" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HAt-8V-MUY">
+                    <rect key="frame" x="289" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp10" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Kb5-Om-0L7">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="0hI-oI-fpk"/>
+                        <constraint firstAttribute="height" constant="18" id="FHx-HL-Iiw"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="8BW-2y-1JE"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="11" translatesAutoresizingMaskIntoConstraints="NO" id="MeJ-op-Krm">
-                    <rect key="frame" x="314" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="Q7Z-2Q-iZJ"/>
-                        <constraint firstAttribute="width" constant="18" id="dpO-hq-BoF"/>
-                    </constraints>
+                <button tag="11" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MeJ-op-Krm">
+                    <rect key="frame" x="315" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp11" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="r8i-P4-NIE">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="Q7Z-2Q-iZJ"/>
+                        <constraint firstAttribute="width" constant="18" id="dpO-hq-BoF"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="Upe-GD-2D0"/>
                     </connections>
@@ -365,28 +366,28 @@ Gw
                     <subviews>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HL7-wb-c4f">
                             <rect key="frame" x="-2" y="-1" width="65" height="18"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="63" id="TPn-Tm-soW"/>
-                                <constraint firstAttribute="height" constant="16" id="fDV-3H-nGu"/>
-                            </constraints>
                             <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="a30-41-iLy">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="63" id="TPn-Tm-soW"/>
+                                <constraint firstAttribute="height" constant="16" id="fDV-3H-nGu"/>
+                            </constraints>
                             <connections>
                                 <action selector="dateCheck_Click:" target="-2" id="cfu-dJ-mEO"/>
                             </connections>
                         </button>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="d71-o2-Nvh">
                             <rect key="frame" x="81" y="-1" width="65" height="18"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="63" id="okr-9i-Hyc"/>
-                                <constraint firstAttribute="height" constant="16" id="qLd-Zt-VKi"/>
-                            </constraints>
                             <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="GLo-R9-Dxn">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="63" id="okr-9i-Hyc"/>
+                                <constraint firstAttribute="height" constant="16" id="qLd-Zt-VKi"/>
+                            </constraints>
                             <connections>
                                 <action selector="timeCheck_Click:" target="-2" id="kNo-zB-U3I"/>
                             </connections>
@@ -458,13 +459,13 @@ Gw
                     </connections>
                 </button>
                 <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Azq-FB-w2y">
-                    <rect key="frame" x="91" y="28" width="177" height="116"/>
+                    <rect key="frame" x="94" y="32" width="171" height="110"/>
                     <view key="contentView" id="zvE-ep-MW7">
-                        <rect key="frame" x="0.0" y="0.0" width="177" height="116"/>
+                        <rect key="frame" x="0.0" y="0.0" width="171" height="110"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bww-Hi-1RW">
-                                <rect key="frame" x="78" y="53" width="20" height="20"/>
+                                <rect key="frame" x="75" y="50" width="20" height="20"/>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameMainToolbarUp" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="bkX-sC-n4N">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -473,8 +474,8 @@ Gw
                                     <action selector="selectImageButton_Click:" target="-2" id="FgF-1R-KId"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZS6-14-hOj">
-                                <rect key="frame" x="70" y="32" width="37" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZS6-14-hOj">
+                                <rect key="frame" x="67" y="29" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Qmd-br-6tD">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>

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

@@ -16,8 +16,8 @@
 #import "CTTabWindowController.h"
 #import "CTTabStripModel.h"
 #import "CTTabStripView.h"
-#import "CTTabController.h"
 #import "CTBrowserWindow.h"
+#import "CTTabController.h"
 #import "CPDFListView+Public.h"
 #import "KMGeneralAnnotationViewController.h"
 #import "KMAnnotationPropertiesViewController.h"
@@ -61,4 +61,4 @@
 #import "KMOCTool.h"
 #import "KMGOCRManager.h"
 #import "CPDFAnnotationModel.h"
-
+#import "CPDFListView.h"