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

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

@@ -408,6 +408,8 @@
         title = NSLocalizedString(@"Text", nil);
     else if (annotationMode == CAnnotationTypeSignDate)
         title = NSLocalizedString(@"Date", nil);
+    else if (annotationMode == CAnnotationTypeStamp)
+        title = NSLocalizedString(@"Stamp", nil);
     else
         title = @"";
     if(_annotations.count > 1) {
@@ -486,12 +488,10 @@
         self.propertiesBox.contentView = vc.view;
         self.contentViewController = vc;
     } else if (annotationMode == CAnnotationTypeStamp) {
-        self.titleViewHeightConstraint.constant = 0;
         KMAnnotationStampViewController *vc = [[KMAnnotationStampViewController alloc] init];
         vc.pdfView = self.pdfView;
         vc.annotationModel = annotationModel;
-        vc.view.frame = [self viewControllerRect];
-        [self.view addSubview:vc.view];
+        self.propertiesBox.contentView = vc.view;
         self.contentViewController = vc;
     } else if (annotationMode == CAnnotationTypeSignSignature) {
         KMSignatureAnnotationViewController *vc = [[KMSignatureAnnotationViewController alloc] init];

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

@@ -1,8 +1,8 @@
 <?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>
@@ -80,7 +80,7 @@
                                 <rect key="frame" x="-100" y="-100" width="233" height="15"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
-                            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="kvH-mO-OTI" customClass="KBaseScroller">
+                            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="kvH-mO-OTI">
                                 <rect key="frame" x="797" y="0.0" width="15" height="340"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.xib

@@ -232,7 +232,7 @@
                     <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"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <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"/>