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

# Conflicts:
#	PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.h

@@ -399,5 +399,6 @@ enum {
 
 - (void)PDFListViewAnnotationEditModeChange:(CPDFListView *)pdfListView forAnnotation:(CPDFAnnotation *)anotation;
 
+- (void)PDFListViewEndEditMode:(CPDFListView *)pdfListView;
 
 @end

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m

@@ -406,6 +406,10 @@ void CPDFListViewOCDrawLineHandles(CGContextRef context, CGRect rect, CGFloat ra
         if (_toolMode == CEditPDFToolMode) {
             if(self.isEdited) {
                 [self commitEditing];
+                
+                if([self.pdfListViewDelegate respondsToSelector:@selector(PDFListViewEndEditMode:)])
+                    [self.pdfListViewDelegate PDFListViewEndEditMode:self];
+
             }
             [self endOfEditing];
         }

PDF Office/PDF Master/Class/PDFWindowController/PDFSDK/ComPDFKit.framework/Versions/A/Headers/CPDFView+Editing.h

@@ -487,6 +487,8 @@ typedef NS_OPTIONS(NSInteger, CEditingAreaSelectBorderZoomPointType) {
 
 - (void)copyEditAreaAction;
 
+- (void)selectAllAreaAction;
+
 - (void)selectAllActionWithEditArea:(CPDFEditArea *)editArea;
 
 - (BOOL)isSupportPast;

PDF Office/PDF Master/Class/PDFWindowController/PDFSDK/ComPDFKit.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>21G72</string>
+	<string>21E230</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,29 +17,29 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.3.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2200</string>
+	<string>2300</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>14B47b</string>
+	<string>13A233</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>13.0</string>
+	<string>11.3</string>
 	<key>DTSDKBuild</key>
-	<string>22A372</string>
+	<string>20E214</string>
 	<key>DTSDKName</key>
-	<string>macosx13.0</string>
+	<string>macosx11.3</string>
 	<key>DTXcode</key>
-	<string>1410</string>
+	<string>1300</string>
 	<key>DTXcodeBuild</key>
-	<string>14B47b</string>
+	<string>13A233</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.11</string>
 </dict>

PDF Office/PDF Master/Class/PDFWindowController/PDFSDK/ComPDFKit.framework/Versions/A/_CodeSignature/CodeResources

@@ -6,15 +6,15 @@
 	<dict>
 		<key>Resources/Assets.car</key>
 		<data>
-		KyEk4oxSvC32RjwMCvnVaepFm7Q=
+		Lsv7/Q81njxGwXBA8bI9Dpf4F1w=
 		</data>
 		<key>Resources/CPDFUnlockViewController.nib/keyedobjects-101300.nib</key>
 		<data>
-		ULC3lJLcrnOnCBivTpSe8w8O/VQ=
+		e/XSIlGXrK/XQ3MPSq17IjdvEEo=
 		</data>
 		<key>Resources/CPDFUnlockViewController.nib/keyedobjects.nib</key>
 		<data>
-		0H15nmzgJVoRpoNxPw6ZO38r4Xs=
+		Dv5ax23hZ/GohlG6yLpCpgKtmBE=
 		</data>
 		<key>Resources/Cert/0d264c89.0</key>
 		<data>
@@ -46,11 +46,11 @@
 		</data>
 		<key>Resources/Info.plist</key>
 		<data>
-		eUAIWe8Jd6faz17Btb4tXx/y96U=
+		pSyjcH/RckiomBkPO0pBkzZjX7g=
 		</data>
 		<key>Resources/default.metallib</key>
 		<data>
-		jzLBEgCveMkMFXwcYUGaOyq4TKI=
+		OW1waXyR5Kz59kYzU5PENdarCTU=
 		</data>
 		<key>Resources/empty_password.png</key>
 		<data>
@@ -1032,11 +1032,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ysjrRq0AqS6qipDFmtS2/bgRgIQ=
+			pJQK9LNXVKHHW4qXp4oCAjwMUqM=
 			</data>
 			<key>hash2</key>
 			<data>
-			rhQDcf6XgA7yXrGAGNth8cpwolcPtlgtUMApNP3B7O0=
+			10RDqYTOFf9PewxCiEQ7nt3t/SNC34APpGVNBxKHmhg=
 			</data>
 		</dict>
 		<key>Headers/CPDFView+Utilities.h</key>
@@ -1142,33 +1142,33 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			KyEk4oxSvC32RjwMCvnVaepFm7Q=
+			Lsv7/Q81njxGwXBA8bI9Dpf4F1w=
 			</data>
 			<key>hash2</key>
 			<data>
-			GfS4+ScTn233MwqT18qLBXcX4Y1TClZTntUE75vTPwY=
+			PHXwNJNPYSsfT1XIPEdwX2PrSmexDOCEb4tCnkhHshk=
 			</data>
 		</dict>
 		<key>Resources/CPDFUnlockViewController.nib/keyedobjects-101300.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			ULC3lJLcrnOnCBivTpSe8w8O/VQ=
+			e/XSIlGXrK/XQ3MPSq17IjdvEEo=
 			</data>
 			<key>hash2</key>
 			<data>
-			WE60TS6kbusEaTyP03p7VENFKl+sD8oqeeumuSb/Kyw=
+			Cci8sTloeOT1JTL92WrgtxN/YiPEzExX+pbP8X68m+Q=
 			</data>
 		</dict>
 		<key>Resources/CPDFUnlockViewController.nib/keyedobjects.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			0H15nmzgJVoRpoNxPw6ZO38r4Xs=
+			Dv5ax23hZ/GohlG6yLpCpgKtmBE=
 			</data>
 			<key>hash2</key>
 			<data>
-			crpgU0SlPe67g5lOUe+Pn4AZLeVkBFKS9oSX5WNWDjo=
+			u30610+slEfn4T8al/uF0uaEk6zWaMgecsgOru7puII=
 			</data>
 		</dict>
 		<key>Resources/Cert/0d264c89.0</key>
@@ -1252,22 +1252,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			eUAIWe8Jd6faz17Btb4tXx/y96U=
+			pSyjcH/RckiomBkPO0pBkzZjX7g=
 			</data>
 			<key>hash2</key>
 			<data>
-			y4EMlFXQfBV2O/aopxyZiZIYDDT1LhnIofrQyQghkNA=
+			ObF7FQ06SOGp8nKR7I6F1Tv55+pVj6ksfils42c032g=
 			</data>
 		</dict>
 		<key>Resources/default.metallib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			jzLBEgCveMkMFXwcYUGaOyq4TKI=
+			OW1waXyR5Kz59kYzU5PENdarCTU=
 			</data>
 			<key>hash2</key>
 			<data>
-			Jk0Hy+FQsbG3BwetLpjotIY/w8Oqm9cX+sP+Qc1ZOQw=
+			IWxLuwqEZ9Pnv1OTOt5tixhIqu82+kdo59Ff6hmjuaM=
 			</data>
 		</dict>
 		<key>Resources/empty_password.png</key>

PDF Office/PDF Master/KMClass/KMNPDFPageEdit/KMNThumbnailView/KMNThumbnailBaseViewController.swift

@@ -543,8 +543,8 @@ class KMNThumbnailBaseViewController: KMNBaseViewController,NSCollectionViewDele
                 if FileManager.default.fileExists(atPath: tFilePath) {
                     try? FileManager.default.removeItem(atPath: tFilePath)
                 }
-              let zz = try? FileManager.default.copyItem(atPath: filePathtPath, toPath: tFilePath)
-
+                try? FileManager.default.copyItem(atPath: filePathtPath, toPath: tFilePath)
+                
                 self.dragFilePath = filePathtPath
             }
         }

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

@@ -328,6 +328,12 @@ struct KMNMWCFlags {
         newMwcFlags.settingUpWindow = true
     }
     
+    @objc  func editFontColorItemPanelAction(_ sender: Any) {
+        if let color = (sender as? NSColorPanel)?.color {
+            listView.changeEditingTextarea_Color(color: color)
+        }
+    }
+    
     //MARK: - document load成功
     private func documentLoadComplete() {
     
@@ -5803,6 +5809,17 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
     func pdfListViewSplitModeShowBar()->Bool {
         return viewManager.splitShowBottomBar
     }
+    
+    func pdfListViewEndEditMode(_ pdfListView: CPDFListView!) {
+        let document = listView.document
+        if(document != nil) {
+            for i in 0..<document!.pageCount {
+                let thumbnail = KMNThumbnail.init(document: document!, currentPageIndex: Int(i))
+                thumbnail.removeCacheImage()
+            }
+        }
+        botaViewController?.thumnailViewController?.reloadDatas()
+    }
         
     //MARK: -Crop
     func pdfListViewChangedSelectionOrMagnification(_ pdfListView: CPDFListView!) {
@@ -6562,7 +6579,11 @@ extension KMMainViewController: ComponentGroupDelegate {
         } else if(menuItemProperty?.identifier == PDFViewMenuIdentifier_Edit_NoStylePaste) {
             listView.pasteEditAreaAction()
         } else if(menuItemProperty?.identifier == PDFViewMenuIdentifier_Edit_SelectAll) {
-            listView.selectAllAction(with: listView.km_EditingAreas().first)
+            if listView.km_EditingAreas().count <= 0 {
+                listView.selectAllAreaAction()
+            } else {
+                listView.selectAllAction(with: listView.km_EditingAreas().first)
+            }
         } else if(menuItemProperty?.identifier == PDFViewMenuIdentifier_Edit_AddLink) {
              pdfToolbarController?.clickWithIdentify(KMPDFToolbar_edit_link_Identifier)
             
@@ -6585,7 +6606,10 @@ extension KMMainViewController: ComponentGroupDelegate {
         } else if(menuItemProperty?.identifier == PDFViewMenuIdentifier_Edit_FontZoomOut) {
             listView.zoomInEditTextFontSize()
         } else if(menuItemProperty?.identifier == PDFViewMenuIdentifier_Edit_FontColor) {
-            
+            let colorPanel = NSColorPanel.shared
+            colorPanel.setTarget(self)
+            colorPanel.setAction(#selector(editFontColorItemPanelAction(_:)))
+            colorPanel.orderFront(nil)
         } else if(menuItemProperty?.identifier == PDFViewMenuIdentifier_Edit_FontH1Name) {
             let model = KMEditPDFTextManager.manager.fetchUserDefaultData(type: .h1)
             self.updateEditPDFTextFontModel(model)

PDF Office/PDF Master/KMClass/Left/Annotaion/Controller/KMLeftSideViewController+Note.swift

@@ -607,9 +607,9 @@ extension KMLeftSideViewController {
     }
     
     func note_refrshUIIfNeed() {
-//        Task { @MainActor in
-//            self.noteOutlineView.reloadData()
-//        }
+        Task { @MainActor in
+            self.noteOutlineView?.reloadData()
+        }
     }
     
     func note_reloadDataIfNeed() {

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

@@ -3024,7 +3024,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "4999"
             endingLineNumber = "4999"
-            landmarkName = "pdfListViewKeyDownIsContinue(_:theEvent:)"
+            landmarkName = "pdfViewEditingAddTextArea(_:add:add:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -3117,6 +3117,21 @@
                   endingLineNumber = "4999"
                   offsetFromSymbolStart = "1356">
                </Location>
+               <Location
+                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - 39037c5fdb3a8f55"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.pdfViewEditingAddTextArea(_: Swift.Optional&lt;__C.CPDFView&gt;, add: Swift.Optional&lt;__C.CPDFPage&gt;, add: __C.CGRect) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4999"
+                  endingLineNumber = "4999"
+                  offsetFromSymbolStart = "1180">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -5093,129 +5108,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "7EA5A061-399F-4EE9-B9C0-16DCE1F7448F"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4790"
-            endingLineNumber = "4790"
-            landmarkName = "pdfViewEditingCropBoundsDidChanged(_:editing:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "7EA5A061-399F-4EE9-B9C0-16DCE1F7448F - 14638edc2d0c37d1"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Reader_Pro.KMMainViewController.pdfViewEditingAddImageArea(_: Swift.Optional&lt;__C.CPDFView&gt;, add: Swift.Optional&lt;__C.CPDFPage&gt;, add: __C.CGRect) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4789"
-                  endingLineNumber = "4789"
-                  offsetFromSymbolStart = "2380">
-               </Location>
-               <Location
-                  uuid = "7EA5A061-399F-4EE9-B9C0-16DCE1F7448F - 14638edc2d0c37b0"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Reader_Pro.KMMainViewController.pdfViewEditingAddImageArea(_: Swift.Optional&lt;__C.CPDFView&gt;, add: Swift.Optional&lt;__C.CPDFPage&gt;, add: __C.CGRect) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4790"
-                  endingLineNumber = "4790"
-                  offsetFromSymbolStart = "2440">
-               </Location>
-               <Location
-                  uuid = "7EA5A061-399F-4EE9-B9C0-16DCE1F7448F - 14638edc2d0c37b0"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Reader_Pro.KMMainViewController.pdfViewEditingAddImageArea(_: Swift.Optional&lt;__C.CPDFView&gt;, add: Swift.Optional&lt;__C.CPDFPage&gt;, add: __C.CGRect) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4790"
-                  endingLineNumber = "4790"
-                  offsetFromSymbolStart = "2344">
-               </Location>
-               <Location
-                  uuid = "7EA5A061-399F-4EE9-B9C0-16DCE1F7448F - 14638edc2d0c37b0"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Reader_Pro.KMMainViewController.pdfViewEditingAddImageArea(_: Swift.Optional&lt;__C.CPDFView&gt;, add: Swift.Optional&lt;__C.CPDFPage&gt;, add: __C.CGRect) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4790"
-                  endingLineNumber = "4790"
-                  offsetFromSymbolStart = "2288">
-               </Location>
-               <Location
-                  uuid = "7EA5A061-399F-4EE9-B9C0-16DCE1F7448F - 4f3bbbeae8688acd"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.pdfViewEditingCropBoundsDidChanged(_: Swift.Optional&lt;__C.CPDFView&gt;, editing: Swift.Optional&lt;__C.CPDFEditArea&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4790"
-                  endingLineNumber = "4790"
-                  offsetFromSymbolStart = "80">
-               </Location>
-               <Location
-                  uuid = "7EA5A061-399F-4EE9-B9C0-16DCE1F7448F - b0afbb940b057722"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.pdfViewScaleDidChanged(Swift.Optional&lt;__C.CPDFView&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4790"
-                  endingLineNumber = "4790"
-                  offsetFromSymbolStart = "2672">
-               </Location>
-               <Location
-                  uuid = "7EA5A061-399F-4EE9-B9C0-16DCE1F7448F - b0afbb940b057722"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.pdfViewScaleDidChanged(Swift.Optional&lt;__C.CPDFView&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4790"
-                  endingLineNumber = "4790"
-                  offsetFromSymbolStart = "2908">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent