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

PDF Office/PDF Master/Class/Batch/Data/KMBatchBaseParameter.swift

@@ -201,8 +201,11 @@ import Cocoa
         } else {
             while fileManager.fileExists(atPath: uniqueFilePath) {
                 i += 1
-                let path = "\(filePath.deletingPathExtension)(\(i))"
-                uniqueFilePath = path.stringByAppendingPathComponent(filePath.extension)
+                var path = "\(filePath.deletingPathExtension)(\(i))"
+//                uniqueFilePath = path.stringByAppendingPathComponent(filePath.extension)
+//                path.append(".")
+                path.append(filePath.extension)
+                uniqueFilePath = path
             }
         }
         

PDF Office/PDF Master/Class/Batch/View/KMCustomViewButton.swift

@@ -215,9 +215,8 @@ import Cocoa
             self._showPop()
             if (self.dataSource == nil) {
                 NotificationCenter.default.post(name: NSNotification.Name("KMCloseCustomViewButtonPopNotification"), object: nil)
-            }//else {
-//                self._state = .mouseIn
-//            }
+            }
+            self._state = .mouseIn
         }
     }
     

PDF Office/PDF Master/Class/KMLightMember/Tools/Email/KMMailHelper.swift

@@ -7,8 +7,7 @@
 
 import Cocoa
 
-@objc
-class KMMailHelper: NSObject {
+@objcMembers class KMMailHelper: NSObject {
     static func sendFile(withPaths paths: [String]) {
         var totalFileString: String?
         for (index, path) in paths.enumerated() {
@@ -48,7 +47,7 @@ class KMMailHelper: NSObject {
         }
     }
     
-    static func newEmail(withContacts contact: String, andSubjects subjects: String) {
+    @objc static func newEmail(withContacts contact: String, andSubjects subjects: String) {
         let emailString = """
             tell application "Mail"
                 set newMessage to make new outgoing message with properties {subject:"\(subjects)" & return}

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/Common/KMPDFConvert.swift

@@ -127,15 +127,15 @@ class KMPDFConvert: Operation {
         
         
         if convertType == .jpeg || convertType == .jpg || convertType == .png || convertType == .gif || convertType == .tga || convertType == .bmp || convertType == .jp2 || convertType == .tiff {
-            if (self.convertType == .jpeg || self.convertType == .png) {
-                self.outputFilePath = "\(path)/\(fileName).zip"
-            } else {
+//            if (self.convertType == .jpeg || self.convertType == .png) {
+//                self.outputFilePath = "\(path)/\(fileName).zip"
+//            } else {
                 path.append("/")
                 path.append(fileName)
-    //            let folderPath = getUniqueFilePath(filePath: path)
+                let folderPath = getUniqueFilePath(filePath: path)
                 try?FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: false)
-                outputFilePath = path
-            }
+                outputFilePath = folderPath
+//            }
         } else {
             if !pathExtension.isEmpty {
                 fileName.append(".")
@@ -143,9 +143,9 @@ class KMPDFConvert: Operation {
                 
                 path.append("/")
                 path.append(fileName)
-//                let folderPath = getUniqueFilePath(filePath: path)
+                let folderPath = getUniqueFilePath(filePath: path)
                 
-                outputFilePath = path
+                outputFilePath = folderPath
             } else {
                 outputFolderPath.append("/")
                 outputFolderPath.append(outputFileName)

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationViewController.xib

@@ -42,7 +42,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="PDFProIcon" id="W4I-tX-LHB"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fhe-gE-tgL">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fhe-gE-tgL">
                     <rect key="frame" x="99" y="115" width="174" height="16"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="PDF Reader Pro Activation" id="BcW-z4-jmX">
                         <font key="font" metaFont="systemBold"/>
@@ -50,7 +50,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Z02-5i-oDf">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Z02-5i-oDf">
                     <rect key="frame" x="99" y="89" width="424" height="14"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Buy Full Version to annotate and edit your PDF documents." id="bvR-5d-z54">
                         <font key="font" metaFont="smallSystem"/>

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m

@@ -761,7 +761,7 @@ static KMVerificationWindowController *_currentWindowController = nil;
     }
     
     NSString* subjects = [[self getAppNameForSupportEmail] stringByAppendingFormat:NSLocalizedString(@" - %@;Verification Feedback;%@", nil) ,tAppVersion,versionString];
-//    [KMMailHelper newEmailWithContacts:@"support@pdfreaderpro.com" andSubjects:subjects];
+    [KMMailHelper newEmailWithContacts:@"support@pdfreaderpro.com" andSubjects:subjects];
 }
 
 - (void)unbindAction {

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

@@ -228,5 +228,101 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8B48DE07-E799-49FB-84C2-545601724021"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "976"
+            endingLineNumber = "976"
+            landmarkName = "cropAllPageItem(sender:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D23D3256-568F-45C5-BB8D-43B89ED7018C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/src/Browser Window/CTBrowser.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "142"
+            endingLineNumber = "142"
+            landmarkName = "-windowDidBeginToClose"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "250E8571-FF9A-4F21-A82D-9045D440563F"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowser.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "31"
+            endingLineNumber = "31"
+            landmarkName = "windowDidBeginToClose()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "44D0B49A-36B2-49D7-8950-6856068635F3"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "487"
+            endingLineNumber = "487"
+            landmarkName = "-verificationActivateAIInfo:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "44D0B49A-36B2-49D7-8950-6856068635F3 - c98d300759d935a4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMVerificationWindowController verificationActivateAIInfo:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "487"
+                  endingLineNumber = "487"
+                  offsetFromSymbolStart = "72">
+               </Location>
+               <Location
+                  uuid = "44D0B49A-36B2-49D7-8950-6856068635F3 - c98d300759d935a4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMVerificationWindowController verificationActivateAIInfo:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/KMVerificationWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "487"
+                  endingLineNumber = "487"
+                  offsetFromSymbolStart = "108">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>