【综合】KMGeneralPreferences文件名更改

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2438,9 +2438,9 @@
 		BB65A0402AF8863F003A27A0 /* GeneralPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB65A03D2AF8863E003A27A0 /* GeneralPreferences.xib */; };
 		BB65A0412AF8863F003A27A0 /* GeneralPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB65A03D2AF8863E003A27A0 /* GeneralPreferences.xib */; };
 		BB65A0422AF8863F003A27A0 /* GeneralPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB65A03D2AF8863E003A27A0 /* GeneralPreferences.xib */; };
-		BB65A0472AF893DD003A27A0 /* SKGeneralPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A0462AF893DD003A27A0 /* SKGeneralPreferences.swift */; };
-		BB65A0482AF893DD003A27A0 /* SKGeneralPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A0462AF893DD003A27A0 /* SKGeneralPreferences.swift */; };
-		BB65A0492AF893DD003A27A0 /* SKGeneralPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A0462AF893DD003A27A0 /* SKGeneralPreferences.swift */; };
+		BB65A0472AF893DD003A27A0 /* KMGeneralPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A0462AF893DD003A27A0 /* KMGeneralPreferences.swift */; };
+		BB65A0482AF893DD003A27A0 /* KMGeneralPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A0462AF893DD003A27A0 /* KMGeneralPreferences.swift */; };
+		BB65A0492AF893DD003A27A0 /* KMGeneralPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A0462AF893DD003A27A0 /* KMGeneralPreferences.swift */; };
 		BB65A0502AF8B64B003A27A0 /* DisplayPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB65A04F2AF8B64B003A27A0 /* DisplayPreferences.xib */; };
 		BB65A0512AF8B64B003A27A0 /* DisplayPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB65A04F2AF8B64B003A27A0 /* DisplayPreferences.xib */; };
 		BB65A0522AF8B64B003A27A0 /* DisplayPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB65A04F2AF8B64B003A27A0 /* DisplayPreferences.xib */; };
@@ -4526,7 +4526,7 @@
 		BB6347C32AF24F6300F5438E /* KMBatchoperateConvertCollectionViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchoperateConvertCollectionViewItem.swift; sourceTree = "<group>"; };
 		BB6347C72AF24F6C00F5438E /* KMBatchoperateConvertCollectionViewItem.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMBatchoperateConvertCollectionViewItem.xib; sourceTree = "<group>"; };
 		BB65A03D2AF8863E003A27A0 /* GeneralPreferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GeneralPreferences.xib; sourceTree = "<group>"; };
-		BB65A0462AF893DD003A27A0 /* SKGeneralPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SKGeneralPreferences.swift; sourceTree = "<group>"; };
+		BB65A0462AF893DD003A27A0 /* KMGeneralPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMGeneralPreferences.swift; sourceTree = "<group>"; };
 		BB65A04F2AF8B64B003A27A0 /* DisplayPreferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DisplayPreferences.xib; sourceTree = "<group>"; };
 		BB65A0532AF8B90F003A27A0 /* KMDisplayPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMDisplayPreferences.swift; sourceTree = "<group>"; };
 		BB65A05C2AF8BF2A003A27A0 /* NotesPreferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NotesPreferences.xib; sourceTree = "<group>"; };
@@ -7215,7 +7215,7 @@
 				BB65A04F2AF8B64B003A27A0 /* DisplayPreferences.xib */,
 				BB65A0532AF8B90F003A27A0 /* KMDisplayPreferences.swift */,
 				BB65A03D2AF8863E003A27A0 /* GeneralPreferences.xib */,
-				BB65A0462AF893DD003A27A0 /* SKGeneralPreferences.swift */,
+				BB65A0462AF893DD003A27A0 /* KMGeneralPreferences.swift */,
 				BB003013298CA446002DD1A0 /* KMPreferenceGeneralController.swift */,
 				BB003014298CA446002DD1A0 /* KMPreferenceGeneralController.xib */,
 				BB003024298CF7EC002DD1A0 /* KMPreferenceDisplayController.swift */,
@@ -10471,7 +10471,7 @@
 				F37322E7292DF9410013862C /* CPDFAnnotationModel.m in Sources */,
 				9FBA0EF92900188F001117AF /* KMFastToolCollectionView.swift in Sources */,
 				BBFE6E752930E53000142C01 /* KMMergePopoverViewController.swift in Sources */,
-				BB65A0472AF893DD003A27A0 /* SKGeneralPreferences.swift in Sources */,
+				BB65A0472AF893DD003A27A0 /* KMGeneralPreferences.swift in Sources */,
 				9FBA0EFE29015A82001117AF /* KMFastToolCollectionViewItem.swift in Sources */,
 				BBA8B7A32935CD740097D183 /* KMRemovePasswordAlertWindowController.swift in Sources */,
 				BB853C6F2AF879C1009C20C1 /* KMBatchRemoveWatermarkOperation.swift in Sources */,
@@ -11821,7 +11821,7 @@
 				AD867FA729DFB77500F00440 /* KMAnnotationOutlineView.swift in Sources */,
 				BBB9B32C299A5D6D004F3235 /* GTMOAuth2KeychainCompatibility.m in Sources */,
 				AD9527D82952ED970039D2BC /* KMPrintPresenter_C.swift in Sources */,
-				BB65A0482AF893DD003A27A0 /* SKGeneralPreferences.swift in Sources */,
+				BB65A0482AF893DD003A27A0 /* KMGeneralPreferences.swift in Sources */,
 				BB146FB8299DC0D100784A6A /* GTLRRuntimeCommon.m in Sources */,
 				BB8B173D2907CDD9001C5EA5 /* NibLoadable.swift in Sources */,
 				9F0CB51A2986568000007028 /* KMDesignToken+BorderRadiusTopRight.swift in Sources */,
@@ -12668,7 +12668,7 @@
 				ADE3C1FF29A5C44700793B13 /* KMLightMemberManager.swift in Sources */,
 				BB146FD7299DC0D100784A6A /* GTLRObject.m in Sources */,
 				BBDA8A6B2A31B50C006A2C4E /* KMCustomStepperView.swift in Sources */,
-				BB65A0492AF893DD003A27A0 /* SKGeneralPreferences.swift in Sources */,
+				BB65A0492AF893DD003A27A0 /* KMGeneralPreferences.swift in Sources */,
 				BB6DD81A29348A00001F0544 /* KMSecureEncryptComboBoxCellView.swift in Sources */,
 				BB147019299DC0D100784A6A /* OIDGrantTypes.m in Sources */,
 				BB146FC5299DC0D100784A6A /* GTMReadMonitorInputStream.m in Sources */,

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -273,21 +273,6 @@
                   endingLineNumber = "332"
                   offsetFromSymbolStart = "299">
                </Location>
-               <Location
-                  uuid = "4AA5DDA9-7119-40D7-89B4-F368372F819A - 89e3ff688b88713e"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditPDFTextManager.setFontAlignment(alignment: __C.NSTextAlignment) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/Manager/KMEditPDFTextManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "332"
-                  endingLineNumber = "332"
-                  offsetFromSymbolStart = "192">
-               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>

PDF Office/PDF Master/Class/Preference/Controller/GeneralPreferences.xib

@@ -6,7 +6,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="SKGeneralPreferences" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMGeneralPreferences" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="authorLabel" destination="zUR-X9-aGq" id="PKY-XP-pcE"/>
                 <outlet property="authorTextField" destination="Pi4-Gm-XJ3" id="jjy-qG-sCq"/>

PDF Office/PDF Master/Class/Preference/Controller/SKGeneralPreferences.swift

@@ -1,5 +1,5 @@
 //
-//  SKGeneralPreferences.swift
+//  KMGeneralPreferences.swift
 //  PDF Master
 //
 //  Created by tangchao on 2023/11/6.
@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class SKGeneralPreferences: NSViewController {
+class KMGeneralPreferences: NSViewController {
     
     /*
      #define  @""
@@ -51,7 +51,7 @@ class SKGeneralPreferences: NSViewController {
     }
     
     /*
-     @interface SKGeneralPreferences : NSViewController <SKPreferencePane> {
+     @interface KMGeneralPreferences : NSViewController <SKPreferencePane> {
          NSArray *revertPDFSettingsButtons;
          NSInteger updateInterval;
      }
@@ -66,10 +66,10 @@ class SKGeneralPreferences: NSViewController {
      */
     
     /*
-     static char SKGeneralPreferencesDefaultsObservationContext;
-     static char SKGeneralPreferencesUpdaterObservationContext;
+     static char KMGeneralPreferencesDefaultsObservationContext;
+     static char KMGeneralPreferencesUpdaterObservationContext;
 
-     @interface SKGeneralPreferences (Private)
+     @interface KMGeneralPreferences (Private)
      - (void)synchronizeUpdateInterval;
      - (void)updateRevertButtons;
      @end
@@ -122,11 +122,11 @@ class SKGeneralPreferences: NSViewController {
         self._synchronizeUpdateInterval()
         self._updateRevertButtons()
         
-    //    [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeys:[NSArray arrayWithObjects:SKStringConstants.defaultPDFDisplaySettingsKey, SKStringConstants.defaultFullScreenPDFDisplaySettingsKey, nil] context:&SKGeneralPreferencesDefaultsObservationContext];
+    //    [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeys:[NSArray arrayWithObjects:SKStringConstants.defaultPDFDisplaySettingsKey, SKStringConstants.defaultFullScreenPDFDisplaySettingsKey, nil] context:&KMGeneralPreferencesDefaultsObservationContext];
     //    [NSUserDefaultsController sharedUserDefaultsController]
     #if VERSION_DMG
-//        [[SUUpdater sharedUpdater] addObserver:self forKeyPath:AUTOMATICALLYCHECKSFORUPDATES_KEY options:0 context:&SKGeneralPreferencesUpdaterObservationContext];
-//        [[SUUpdater sharedUpdater] addObserver:self forKeyPath:UPDATECHECKINTERVAL_KEY options:0 context:&SKGeneralPreferencesUpdaterObservationContext];
+//        [[SUUpdater sharedUpdater] addObserver:self forKeyPath:AUTOMATICALLYCHECKSFORUPDATES_KEY options:0 context:&KMGeneralPreferencesUpdaterObservationContext];
+//        [[SUUpdater sharedUpdater] addObserver:self forKeyPath:UPDATECHECKINTERVAL_KEY options:0 context:&KMGeneralPreferencesUpdaterObservationContext];
     #endif
         
         self.autoSaveInfoBtn.title = KMLocalizedString("Autosave Documents", nil)
@@ -267,9 +267,9 @@ class SKGeneralPreferences: NSViewController {
      #pragma mark KVO
 
      - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-         if (context == &SKGeneralPreferencesDefaultsObservationContext)
+         if (context == &KMGeneralPreferencesDefaultsObservationContext)
              [self updateRevertButtons];
-         else if (context == &SKGeneralPreferencesUpdaterObservationContext)
+         else if (context == &KMGeneralPreferencesUpdaterObservationContext)
              [self synchronizeUpdateInterval];
          else
              [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
@@ -305,7 +305,7 @@ class SKGeneralPreferences: NSViewController {
 
 // MARK: - Private Methods
 
-extension SKGeneralPreferences {
+extension KMGeneralPreferences {
     private func _synchronizeUpdateInterval() {
 //        self.willChangeValue(forKey: UPDATEINTERVAL_KEY)
         #if VERSION_DMG
@@ -324,6 +324,6 @@ extension SKGeneralPreferences {
      */
 }
 
-extension SKGeneralPreferences: KMPreferencePane {
+extension KMGeneralPreferences: KMPreferencePane {
     
 }

PDF Office/PDF Master/Class/Preference/Window/KMPreferenceController.swift

@@ -82,7 +82,7 @@ class KMPreferenceController: NSWindowController {
     override func windowDidLoad() {
         super.windowDidLoad()
         
-        self.preferencePanes = [SKGeneralPreferences(), KMDisplayPreferences(), KMNotesPreferences(), KMSyncPreferences()]
+        self.preferencePanes = [KMGeneralPreferences(), KMDisplayPreferences(), KMNotesPreferences(), KMSyncPreferences()]
         self.history = []
         self.historyIndex = 0