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

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -3846,6 +3846,8 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 self.enterPageEdit(pages)
             }
         } else if type == .editPDF {
+            self.listView.updateActiveAnnotations([])
+            self.listView.setNeedsDisplayForVisiblePages()
             self.listView.commitEditFormText()
             self.listView.annotationType = .editTextImage
         } else if type == .Annatiton {
@@ -4621,6 +4623,15 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     let isSelected = toolbarItem.isSelected
                     self.toolbarController.toolbarType = isSelected ? .None : .viewSetting
                     toolbarItem.isSelected = !isSelected
+                    if toolbarItem.isSelected {
+                        FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting"])
+                        self.rightSideViewController.isHidden = false
+                        self.rightSideViewController.subViewType = .ViewSettings
+                        self.openRightPane()
+                    }else{
+                        self.rightSideViewController.isHidden = true
+                        closeRightPane()
+                    }
                     if toolbarItem.isSelected {
                         FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn": "Btn_Tbr_PageDisplay"])
                     }
@@ -4694,11 +4705,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     self.km_beginSheet(windowC: windowC)
                 } else if toolbarItem.itemIdentifier == KMToolbarViewSettingIdentifier {
                     toolbarItem.isSelected = !toolbarItem.isSelected
-                    FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting"])
                     rightSideViewController.mainController = self
-                    self.rightSideViewController.isHidden = false
-                    self.rightSideViewController.subViewType = .ViewSettings
-                    self.toggleRightPane()
                 } else if toolbarItem.itemIdentifier == KMToolbarSnapshotIdentifier {
                     FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_Snapshot"])
                     self.listView.takeSnapshot(nil)

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -2451,10 +2451,22 @@ let LOCKED_KEY  = "locked"
     
     func pdfViewPerformURL(_ pdfView: CPDFView!, withContent content: String!) {
         KMPrint("pdfViewPerformURL")
+        if content != nil {
+            NSWorkspace.shared.open(URL(string: content)!)
+        } else {
+            let alert = NSAlert()
+            alert.alertStyle = .critical
+            alert.informativeText = NSLocalizedString("The hyperlink is invalid.", comment: "")
+            alert.messageText = ""
+            alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
+            alert.runModal()
+            return
+        }
     }
     
     func pdfViewPerformPrint(_ pdfView: CPDFView!) {
         KMPrint("pdfViewPerformPrint")
+        self.currentWindowController.document?.printDocument(nil)
     }
     
     func pdfViewPerformGo(toPage pdfView: CPDFView!) {
@@ -2467,6 +2479,7 @@ let LOCKED_KEY  = "locked"
     
     func pdfViewPerformReset(_ pdfView: CPDFView!) {
         KMPrint("pdfViewPerformReset")
+        self.listView.resetFormAnnotation()
     }
     
     func pdfViewEditingBlockDidChanged(_ pdfView: CPDFView!) {

PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/AIInfoManager.m

@@ -467,6 +467,7 @@ static AIInfoManager *__Manager = nil;
     
     if (self.infoDict[@"start_date"]) {
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+        [formatter setLocale:[NSLocale systemLocale]];
         [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
         self.startDate = [formatter dateFromString:self.infoDict[@"start_date"]] ?: [[NSDate alloc] initWithTimeIntervalSince1970:0];
     } else {
@@ -474,6 +475,7 @@ static AIInfoManager *__Manager = nil;
     }
     if (self.infoDict[@"end_date"]) {
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+        [formatter setLocale:[NSLocale systemLocale]];
         [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
         self.endDate = [formatter dateFromString:self.infoDict[@"end_date"]] ?: [[NSDate alloc] initWithTimeIntervalSince1970:0];
     } else {