【综合】自定义图章细节问题修正

PDF Office/PDF Master/Class/PDFTools/CustomStamp/Views/CustomStampTopToolbar.swift

@@ -388,6 +388,9 @@ extension CustomStampTopToolbar: NSTextFieldDelegate {
             if scale > 100 {
                 scale = 100
             }
+            if scale < 0.1 {
+                scale = 0.1
+            }
             if (scale <= 0.101) {
                 self.pdfView.scaleFactor = self.pdfView.minScaleFactor()
             } else {

PDF Office/PDF Master/Class/PDFTools/CustomStamp/Views/CustomStampTopToolbar.xib

@@ -91,7 +91,7 @@
                                             <attributedString key="attributedStringForZero">
                                                 <fragment content="0%"/>
                                             </attributedString>
-                                            <real key="minimum" value="10"/>
+                                            <real key="minimum" value="0.0"/>
                                             <real key="maximum" value="10000"/>
                                         </numberFormatter>
                                         <font key="font" metaFont="system"/>

PDF Office/PDF Master/Class/PDFTools/CustomStamp/Views/RightView/CSStampListView/CSStampListItem.xib

@@ -44,9 +44,9 @@
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="wtK-0J-0jB">
                             <rect key="frame" x="0.0" y="0.0" width="100" height="28"/>
                         </customView>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ctT-j6-Ewb">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ctT-j6-Ewb">
                             <rect key="frame" x="-2" y="0.0" width="104" height="16"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Label" id="1hZ-th-2ZS">
+                            <textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="center" title="Label" id="1hZ-th-2ZS">
                                 <font key="font" usesAppearanceFont="YES"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

PDF Office/PDF Master/Class/PDFTools/CustomStamp/Views/RightView/Views/CSAnnotationItem.xib

@@ -6,7 +6,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="CSAnnotationItem" customModule="PDFTech_Editor" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="CSAnnotationItem" customModule="LynxPDF_Editor" customModuleProvider="target">
             <connections>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>

PDF Office/PDF Master/Class/PDFTools/CustomStamp/Views/RightView/Views/KMColorChooseItem.swift

@@ -90,6 +90,7 @@ class KMColorChooseItem: NSView, NibLoadable {
     @objc func colorButtonAction(_ sender: Any) {
         NSColorPanel.shared.setTarget(self)
         NSColorPanel.shared.setAction(#selector(colorPanelAction(_:)))
+        NSColorPanel.shared.delegate = self
         NSColorPanel.shared.center()
         NSColorPanel.shared.orderFront(nil)
         
@@ -105,3 +106,12 @@ class KMColorChooseItem: NSView, NibLoadable {
     }
 
 }
+
+extension KMColorChooseItem: NSWindowDelegate {
+    func windowWillClose(_ notification: Notification) {
+        if let object = notification.object as? AnyObject, object.isEqual(NSColorPanel.shared) {
+            NSColorPanel.shared.setTarget(nil)
+            NSColorPanel.shared.setAction(nil)
+        }
+    }
+}

PDF Office/PDF Master/Class/PDFTools/CustomStamp/Views/RightView/Views/KMColorChooseItem.xib

@@ -9,7 +9,7 @@
         <customObject id="-2" userLabel="File's Owner"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="KMColorChooseItem" customModule="PDFTech_Editor" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMColorChooseItem" customModule="LynxPDF_Editor" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="60" height="28"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -1182,6 +1182,11 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
     }
     
     @objc func item_insertFromImage(sender: NSMenuItem?) {
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+            return
+        }
+        
         let openPanel = NSOpenPanel()
         openPanel.allowedFileTypes = KMImageToPDFMethod.supportedImageTypes()
         openPanel.allowsMultipleSelection = true
@@ -1230,6 +1235,10 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
     }
     
     @objc func item_insertFromClipboard(sender: NSMenuItem?) {
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+            return
+        }
 //        self.choosePositionWindow {[weak self] index in
             /// 插入位置
             var error: NSError?
@@ -1291,6 +1300,11 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
     }
     
     @objc func item_insertFromScanner(sender: NSMenuItem?) {
+        if IAPProductsManager.default().isAvailableAllFunction() == false {
+            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+            return
+        }
+        
         let vc = KMDeviceBrowserWindowController.shared
         vc.type = .scanner
         vc.importScannerFileCallback = { [weak self](url: NSURL) -> Void in  

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -4431,9 +4431,11 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                         } else if ([newActiveAnnotation isKindOfClass:[CPDFTextAnnotation class]]) {
                             [self editAnnotation:newActiveAnnotation];
                         } else if ([theEvent clickCount] == 2) {
-                            //                            if (![newActiveAnnotation isKindOfClass:[CPDFTextAnnotation class]]) {
-                            [self editAnnotation:newActiveAnnotation];
-                            //                            }
+                            if ([self.isCustomStampType isEqualToString: @"1"]) {
+                                
+                            } else {
+                                [self editAnnotation:newActiveAnnotation];
+                            }
                         }
                     }
                     [self setNeedsDisplayAnnotationViewForPage:page];

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2423,6 +2423,21 @@
                   endingLineNumber = "877"
                   offsetFromSymbolStart = "472">
                </Location>
+               <Location
+                  uuid = "33B9CFDC-459F-465E-8D2C-8B025F6532D5 - 9b29bc366e01673f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formGeneralProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "877"
+                  endingLineNumber = "877"
+                  offsetFromSymbolStart = "472">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -2501,6 +2516,21 @@
                   endingLineNumber = "896"
                   offsetFromSymbolStart = "364">
                </Location>
+               <Location
+                  uuid = "0D7FB7B9-FAD2-49A2-9F64-9957C240D456 - 9f5a522a5c61a540"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formAppearanceProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "896"
+                  endingLineNumber = "896"
+                  offsetFromSymbolStart = "364">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -2564,6 +2594,21 @@
                   endingLineNumber = "911"
                   offsetFromSymbolStart = "1036">
                </Location>
+               <Location
+                  uuid = "7F85D020-2069-45AF-9894-31F3F9A6A55D - 9f5a522a5c61a7b3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formAppearanceProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "911"
+                  endingLineNumber = "911"
+                  offsetFromSymbolStart = "1036">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -2627,6 +2672,21 @@
                   endingLineNumber = "922"
                   offsetFromSymbolStart = "1528">
                </Location>
+               <Location
+                  uuid = "D1EDAC01-12DA-401E-B6C1-DEF8371D10E0 - 9f5a522a5c61a626"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formAppearanceProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "922"
+                  endingLineNumber = "922"
+                  offsetFromSymbolStart = "1528">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -2690,6 +2750,21 @@
                   endingLineNumber = "936"
                   offsetFromSymbolStart = "2128">
                </Location>
+               <Location
+                  uuid = "553CB960-01B4-4875-A138-107CBBE11ADB - 9f5a522a5c61a068"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formAppearanceProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "936"
+                  endingLineNumber = "936"
+                  offsetFromSymbolStart = "2128">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -2753,6 +2828,21 @@
                   endingLineNumber = "998"
                   offsetFromSymbolStart = "2496">
                </Location>
+               <Location
+                  uuid = "9DE1C220-5C9F-4812-89FE-12E2F7FD53C0 - de698ee80c98863a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formOptionProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "998"
+                  endingLineNumber = "998"
+                  offsetFromSymbolStart = "2496">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -2912,8 +3002,39 @@
                   endingLineNumber = "724"
                   offsetFromSymbolStart = "448">
                </Location>
+               <Location
+                  uuid = "85C3EA36-1C36-4A41-83BF-7CDCDFF728A5 - ab172ecb83dde20"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController setIsContinuousAddStamp:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "724"
+                  endingLineNumber = "724"
+                  offsetFromSymbolStart = "448">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "417C3EA4-1646-4896-9B5A-D5BF93C9190C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFTools/PageEdit/View/KMPDFEditToolbar.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "252"
+            endingLineNumber = "252"
+            landmarkName = "insertMenuAction(sender:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>