Browse Source

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

niehaoyu 2 months ago
parent
commit
fe52eac687

+ 10 - 4
PDF Office/KMComponentLibrary/KMComponentLibrary.xcodeproj/project.pbxproj

@@ -1394,11 +1394,13 @@
 		BB5A9B972CB64CE800F64C1F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = Q43DRF894U;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1417,6 +1419,7 @@
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kdanmobile.KMComponentLibrary;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -1426,11 +1429,13 @@
 		BB5A9B982CB64CE800F64C1F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = Q43DRF894U;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1449,6 +1454,7 @@
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kdanmobile.KMComponentLibrary;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/OC_Tool/KMOCToolClass.swift

@@ -174,7 +174,7 @@ class KMOCToolClass {
                 
                 let highlightDic: [NSAttributedString.Key: Any] = [
                     .font : ComponentLibrary.shared.getFontFromKey("mac/body-s-bold"),
-                    .foregroundColor: KMNColorTools.colorPrimary_textLight()
+                    .foregroundColor: KMNColorTools.colorWarning_base()
                 ]
                 
                 if attributed.length > tRange.length + tRange.location {

+ 1 - 1
PDF Office/PDF Master/KMClass/Left/Search/Controller/KMBotaSearchViewController.swift

@@ -761,7 +761,7 @@ extension KMBotaSearchViewController: NSTableViewDelegate, NSTableViewDataSource
             }
  
             cell?.titleLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-medium")
-            cell?.titleLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-regular")
+            cell?.countLabel.font = ComponentLibrary.shared.getFontFromKey("mac/body-s-regular")
             cell?.titleLabel.textColor = KMNColorTools.colorText_1()
             cell?.countLabel.textColor = KMNColorTools.colorText_3()
             cell?.titleLabel.isEditable = false

+ 3 - 0
PDF Office/PDF Master/KMClass/Tools/Tool/KMNColorTools.swift

@@ -31,6 +31,9 @@ class KMNColorTools: NSObject {
         return ComponentLibrary.shared.getComponentColorFromKey("colorPrimary/textLight")
     }
     
+    @inline (__always) class func colorWarning_base() -> NSColor {
+        return ComponentLibrary.shared.getComponentColorFromKey("colorWarning/base")
+    }
     // MARK: - bg Color
     
     @inline (__always) class func colorBg_popup() -> NSColor {

+ 10 - 4
PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -17995,11 +17995,13 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "PDF Reader Pro DMG.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 202410250;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = F552E2RJ98;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = 4GGQPGRTSV;
 				ENABLE_HARDENED_RUNTIME = YES;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -18172,6 +18174,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
 				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = pdfreaderpro_development_provisioning;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG VERSION_FREE VERSION_DMG";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h";
@@ -18189,11 +18192,13 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "PDF Reader Pro DMG.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 202410250;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = F552E2RJ98;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = 4GGQPGRTSV;
 				ENABLE_HARDENED_RUNTIME = YES;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -18364,6 +18369,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
 				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = pdfreaderpro_development_provisioning;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "VERSION_FREE VERSION_DMG";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h";