【综合】整理代码

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -770,7 +770,6 @@ extension KMMainViewController {
             self.exitPresentationMode()
         }
         
-        //        [self applyPDFSettings:savedNormalSetup];
         self.applyPDFSettings(self.savedNormalSetup)
         self.savedNormalSetup.removeAllObjects()
         

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -467,6 +467,9 @@ let LOCKED_KEY  = "locked"
                 self.showSnapshots(setups: snapshotSetups)
             }
         }
+        
+//        [self applyPDFSettings:hasWindowSetup ? savedNormalSetup : [sud dictionaryForKey:SKDefaultPDFDisplaySettingsKey]];
+        self.applyPDFSettings((KMDataManager.ud_dictionary(forKey: SKDefaultPDFDisplaySettingsKey) as? NSDictionary) ?? [:])
     }
     
     //MARK: - KMToolbarViewControllerDelegate

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

@@ -196,12 +196,12 @@ class KMGeneralPreferences: NSViewController {
     }
     
     @IBAction func revertPDFViewSettings(_ sender: AnyObject?) {
-//        [[NSUserDefaultsController sharedUserDefaultsController] revertToInitialValueForKey:SKStringConstants.defaultPDFDisplaySettingsKey];
+        NSUserDefaultsController.shared.revertToInitialValue(forKey: SKDefaultPDFDisplaySettingsKey)
         KMPreference.shared.revertInitPDFViewSettingType = .normal
     }
     
     @IBAction func revertFullScreenPDFViewSettings(_ sender: AnyObject?) {
-//        [[NSUserDefaultsController sharedUserDefaultsController] revertToInitialValueForKey:SKStringConstants.defaultFullScreenPDFDisplaySettingsKey];
+        NSUserDefaultsController.shared.revertToInitialValue(forKey: SKDefaultFullScreenPDFDisplaySettingsKey)
         KMPreference.shared.revertInitPDFViewSettingType = .fullScreen
     }
     

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

@@ -237,8 +237,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3910"
-            endingLineNumber = "3910"
+            startingLineNumber = "3909"
+            endingLineNumber = "3909"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -253,8 +253,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3918"
-            endingLineNumber = "3918"
+            startingLineNumber = "3917"
+            endingLineNumber = "3917"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
          </BreakpointContent>