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

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

@@ -143,6 +143,8 @@ struct KMNMWCFlags {
     
     var blockSaveWindow = AutoSavePopController()
     
+    private var isShowQuickBar: Bool = false
+    
     private var _needSave = false
     var needSave: Bool {
         set {
@@ -2030,12 +2032,14 @@ struct KMNMWCFlags {
     func reloadPopUIActiveAnnotations(activeAnnotations:[CPDFAnnotation]) {
         let annotationMode = KMNAnnotationPopMode(pdfAnnotations: activeAnnotations )
         let popVC = KMNPopAnnotationViewController.shared
-        if annotationMode.popType == .popTypeNone || !SettingsManager.sharedInstance.showQuickActionBar {
+        
+        if annotationMode.popType == .popTypeNone || (!SettingsManager.sharedInstance.showQuickActionBar && isShowQuickBar == false) {
             closeAnnotationPopWindow()
         } else {
             let win = KMNAnnotationPopToolbarWindow.shared
             win.annotationPopMode = annotationMode
             win.show(relativeTo: CGRectZero, of: self.listView, preferredEdge: .maxY)
+            isShowQuickBar = false
             self.listView.window?.addChildWindow(win, ordered: .above)
             
             popVC.listView = listView
@@ -2065,14 +2069,15 @@ struct KMNMWCFlags {
         let editMode = KMNEditContentPopMode(currentEditAreas: editingAreas)
         let popVC = KMNPopContentEditViewController.shared
 
-        if editMode.popType == .editNone || !SettingsManager.sharedInstance.showQuickActionBar {
+        if editMode.popType == .editNone || (!SettingsManager.sharedInstance.showQuickActionBar && isShowQuickBar == false) {
             closePopContentEditWindow()
         } else {
             let win = KMNContentEditPopToolbarWindow.shared
             win.editContentPopMode = editMode
             win.show(relativeTo: CGRectZero, of: self.listView, preferredEdge: .maxY)
             self.listView.window?.addChildWindow(win, ordered: .above)
-            
+            isShowQuickBar = false
+
             popVC.listView = listView
             popVC.editContentPopMode = editMode
             popVC.isOpenPane = viewManager.showRightSide
@@ -7288,8 +7293,7 @@ extension KMMainViewController: ComponentGroupDelegate {
                 listView.delete(nil)
             }
         } else if(menuItemProperty?.identifier == PDFViewMenuIdentifier_Normal_ShowPopUI) {
-            UserDefaults.standard.setValue(true, forKey: settingsShowQuickActionBarKey)
-            SettingsManager.sharedInstance.showQuickActionBar = true
+            self.isShowQuickBar = true
             reloadPopUIWindow()
         } else if(menuItemProperty?.identifier == PDFViewMenuIdentifier_Normal_SortFirstAnnotation) {
             let activeAnnotations = listView.activeAnnotations

PDF Office/PDF Master/KMClass/PDFListView/WindowController/KMNPopOperationViewController.swift

@@ -181,6 +181,9 @@ class KMNPopOperationViewController: KMNBaseViewController {
             pboard.clearContents()
 
             pboard.writeObjects([imageItem])
+                        
+            _ = KMNCustomAlertView.alertView(message: KMLocalizedString("Copied"), type: .normal_custom, fromView: listView ?? self.view, point:CGPoint(x: CGRectGetMidX(listView?.frame ?? CGRectZero), y: CGRectGetMidY(listView?.frame ?? CGRectZero)))
+
         }
     }