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

PDF Office/PDF Master/Class/PDFTools/AddPassword/View/KMSecurityContentView.swift

@@ -48,6 +48,7 @@ class KMSecurityContentView: BaseXibView {
         
         openPwdCheckBox.properties = ComponentCheckBoxProperty(size: .s, state: .normal, showhelp: true, text: KMLocalizedString("Require a password to open the document.", comment: ""), checkboxType: .normal)
         openPwdCheckBox.setTarget(self, action: #selector(openPasswordButtonAction(_:)))
+        openPwdCheckBox.toolTip = KMLocalizedString("Here is the error message description.")
         openPwdCheckBox.reloadData()
         
         openPwdCheckBoxWidthConstraint.constant = openPwdCheckBox.properties.propertyInfo.viewWidth
@@ -59,11 +60,11 @@ class KMSecurityContentView: BaseXibView {
                                                                 text: "",
                                                                 isDisabled: false,
                                                                 errorText: "Here is the error message description.")
-        openPasswordView.toolTip = KMLocalizedString("Here is the error message description.")
         openPasswordView.delegate = self
         openPasswordView.reloadData()
         
         ownerPwdCheckBox.properties = ComponentCheckBoxProperty(size: .s, state: .normal, showhelp: true, text: KMLocalizedString("Require a password to open the document.", comment: ""), checkboxType: .normal)
+        ownerPwdCheckBox.toolTip = KMLocalizedString("Here is the error message description.")
         ownerPwdCheckBox.setTarget(self, action: #selector(ownerPaasswordButtonAction(_:)))
         
         ownerPasswordView.properties = ComponentPasswordProperty(size: .m,
@@ -73,7 +74,6 @@ class KMSecurityContentView: BaseXibView {
                                                                  text: "",
                                                                  isDisabled: false,
                                                                  errorText: "Here is the error message description.")
-        openPasswordView.toolTip = KMLocalizedString("Here is the error message description.")
         ownerPasswordView.delegate = self
         ownerPwdCheckBoxWidthConstraint.constant = openPwdCheckBox.properties.propertyInfo.viewWidth
         

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -3658,8 +3658,6 @@ extension KMMainViewController {
     
     //OCR
     func convertOCRScanFile(window: KMOCRSettingWindowController, document: CPDFDocument, model: KMOCRModel) {
-//        window.beginLoading()
-        
         KMCompressManager.shared.showLoadingWindow(window: window.window)
         KMCompressManager.shared.cancelAction = {
             KMOCRManager.manager.cancelRecognition()