【偏好设置】KMGeneralPreferences 整理代码

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

@@ -3,38 +3,4 @@
    uuid = "1CCF492B-C35D-4676-9A6F-6C1FA4C62FF1"
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "4866007A-0701-444E-AFC7-C571286D5EE8"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "709"
-            endingLineNumber = "709"
-            landmarkName = "loadOpenFileFunctionGuide(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "58215A11-E067-4E21-81D8-26BD345FE5C5"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuidePanel.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "130"
-            endingLineNumber = "130"
-            landmarkName = "updateViewColor()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

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

@@ -55,9 +55,6 @@
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
-                    <connections>
-                        <action selector="authorTextFieldAction:" target="-2" id="Tbl-1N-Otd"/>
-                    </connections>
                 </textField>
                 <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="fVJ-Td-OI7">
                     <rect key="frame" x="12" y="617" width="356" height="5"/>

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

@@ -16,35 +16,34 @@ class KMGeneralPreferences: NSViewController {
     private let UPDATEINTERVAL_KEY = "updateInterval"
     private let SUScheduledCheckIntervalKey = "SUScheduledCheckInterval"
     
-    @IBOutlet var updateIntervalPopUpButton: NSPopUpButton!
-    
-    @IBOutlet var openFilesLabelField: NSTextField!
-    @IBOutlet var openFilesMatrix: NSMatrix!
-    @IBOutlet var updateIntervalLabelField: NSTextField!
-    
-    @IBOutlet var savePasswordsMatrix: NSMatrix!
-    @IBOutlet var authorLabel: NSTextField!
-    @IBOutlet var authorTextField: NSTextField!
-    
-    @IBOutlet var defaultOpenButton: NSButton!
-    @IBOutlet var openTabLabel: NSTextField!
-    @IBOutlet var openTabButton: NSPopUpButton!
+    @IBOutlet weak var authorLabel: NSTextField!
+    @IBOutlet weak var authorTextField: NSTextField!
     
-    @IBOutlet var showConvertMenuButton: NSButton!
-    @IBOutlet var autoSaveInfoBtn: NSButton!
-    @IBOutlet var autoSaveSlider: NSSlider!
-    
-    @IBOutlet var autoSaveLbl: NSTextField!
+    @IBOutlet weak var openTabLabel: NSTextField!
+    @IBOutlet weak var openTabButton: NSPopUpButton!
+    @IBOutlet weak var showConvertMenuButton: NSButton!
+    @IBOutlet weak var defaultOpenButton: NSButton!
+    @IBOutlet weak var reopenLastOpenFilesButton: NSButton!
+    @IBOutlet weak var autoSaveLbl: NSTextField!
+    @IBOutlet weak var autoSaveInfoBtn: NSButton!
+    @IBOutlet weak var autoSaveSlider: NSSlider!
     
+    @IBOutlet weak var openFilesLabelField: NSTextField!
+    @IBOutlet weak var openFilesMatrix: NSMatrix!
+    @IBOutlet weak var showLeftSideButton: NSButton!
+    @IBOutlet weak var rememberSnapshotButton: NSButton!
     @IBOutlet weak var normalButton: NSButton!
     @IBOutlet weak var fullScreenButton: NSButton!
     
-    @IBOutlet weak var reopenLastOpenFilesButton: NSButton!
-    @IBOutlet weak var showLeftSideButton: NSButton!
-    @IBOutlet weak var rememberSnapshotButton: NSButton!
     @IBOutlet weak var autoSaveNotesBackupButton: NSButton!
+    
     @IBOutlet weak var keepSnapshotOnTopButton: NSButton!
     
+    @IBOutlet var savePasswordsMatrix: NSMatrix!
+    
+    @IBOutlet var updateIntervalPopUpButton: NSPopUpButton!
+    @IBOutlet var updateIntervalLabelField: NSTextField!
+    
     var revertPDFSettingsButtons: [NSButton] = []
     
     var updateInterval: Int = 0 {
@@ -94,22 +93,53 @@ class KMGeneralPreferences: NSViewController {
     
     override func loadView() {
         super.loadView()
+
+    //    self.showConvertMenuButton.state = [KMStatusBar systemStatusBar].isShow ? NSControlStateValueOn : NSControlStateValueOff;
+        
+    #if VERSION_FREE
+    //        if (![IAPProductsManager defaultManager].isAvailableAllFunction) {
+    //            [[NSUserDefaults standardUserDefaults] setInteger:1 forKey:@"KMOpenDocumentInTab"];
+    //        }
+    #endif
+
+        
+    //    [[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:&KMGeneralPreferencesUpdaterObservationContext];
+//        [[SUUpdater sharedUpdater] addObserver:self forKeyPath:UPDATECHECKINTERVAL_KEY options:0 context:&KMGeneralPreferencesUpdaterObservationContext];
+    #endif
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
         
+        self.authorLabel.stringValue = KMLocalizedString("Author:", nil)
         self.authorTextField.delegate = self
         self.authorTextField.stringValue = KMPreferenceManager.shared.author
-        self.defaultOpenButton.state = KMPreference.shared.setDefaultPDFReader ? .on : .off
         
-        self.authorLabel.stringValue = KMLocalizedString("Author:", nil)
-        self.defaultOpenButton.title = KMLocalizedString("Set PDF Reader Pro as the default PDF viewer", nil)
         self.openTabLabel.stringValue = String(format: "%@:", KMLocalizedString("Open a document in", nil))
         for item in self.openTabButton.itemArray {
             item.title = KMLocalizedString(item.title, nil)
         }
-        
+        self.showConvertMenuButton.title = KMLocalizedString("Show PDF Reader Pro in menu bar", nil)
+        self.defaultOpenButton.title = KMLocalizedString("Set PDF Reader Pro as the default PDF viewer", nil)
+        self.defaultOpenButton.state = KMPreference.shared.setDefaultPDFReader ? .on : .off
         self.reopenLastOpenFilesButton.state = KMPreference.shared.openLastUnclosedDocumentWhenAppStart ? .on : .off
+        self.autoSaveInfoBtn.title = KMLocalizedString("Autosave Documents", nil)
+        self.autoSaveInfoBtn.state = AutoSaveManager.manager.autoSaveEnabled ? .on : .off
+        self.autoSaveSlider.isEnabled = AutoSaveManager.manager.autoSaveEnabled
+        if (AutoSaveManager.manager.timeInterval > 1) {
+            self.autoSaveSlider.floatValue = Float((AutoSaveManager.manager.timeInterval - 1) / 19)
+        } else {
+            self.autoSaveSlider.floatValue = 0
+        }
+        self.autoSaveLbl.stringValue = String(format: "%.0f %@", AutoSaveManager.manager.timeInterval, KMLocalizedString("minute(s)", nil))
         
-        self.showConvertMenuButton.title = KMLocalizedString("Show PDF Reader Pro in menu bar", nil)
-    //    self.showConvertMenuButton.state = [KMStatusBar systemStatusBar].isShow ? NSControlStateValueOn : NSControlStateValueOff;
+        self.showLeftSideButton.state = KMPreference.shared.showLeftSideBar ? .on : .off
+        self.rememberSnapshotButton.state = KMPreference.shared.rememberSnapshot ? .on : .off
+        self.autoSaveNotesBackupButton.state = KMPreference.shared.autoSaveNoteBackup ? .on : .off
+        self.keepSnapshotOnTopButton.state = KMPreference.shared.keepSnapshotWindowToTop ? .on : .off
         
         self.authorLabel.sizeToFit()
         var frame = self.authorTextField.frame
@@ -119,13 +149,8 @@ class KMGeneralPreferences: NSViewController {
         frame = self.openTabButton.frame
         frame.origin.x = CGRectGetMaxX(self.openTabLabel.frame)+5
         self.openTabButton.frame = frame
-        
         self.openTabButton.isEnabled = true
-    #if VERSION_FREE
-    //        if (![IAPProductsManager defaultManager].isAvailableAllFunction) {
-    //            [[NSUserDefaults standardUserDefaults] setInteger:1 forKey:@"KMOpenDocumentInTab"];
-    //        }
-    #endif
+        
         self.revertPDFSettingsButtons = [self.normalButton, self.fullScreenButton]
         KMAutoSizeButtons(self.revertPDFSettingsButtons, rightAlign: false)
         _ = KMAutoSizeLabelFields([openFilesLabelField], [openFilesMatrix], false)
@@ -136,33 +161,6 @@ class KMGeneralPreferences: NSViewController {
         
         self._synchronizeUpdateInterval()
         self._updateRevertButtons()
-        
-    //    [[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:&KMGeneralPreferencesUpdaterObservationContext];
-//        [[SUUpdater sharedUpdater] addObserver:self forKeyPath:UPDATECHECKINTERVAL_KEY options:0 context:&KMGeneralPreferencesUpdaterObservationContext];
-    #endif
-        
-        self.autoSaveInfoBtn.title = KMLocalizedString("Autosave Documents", nil)
-        self.autoSaveInfoBtn.state = AutoSaveManager.manager.autoSaveEnabled ? .on : .off
-        self.autoSaveSlider.isEnabled = AutoSaveManager.manager.autoSaveEnabled
-        
-        if (AutoSaveManager.manager.timeInterval > 1) {
-            self.autoSaveSlider.floatValue = Float((AutoSaveManager.manager.timeInterval - 1) / 19)
-        } else {
-            self.autoSaveSlider.floatValue = 0
-        }
-        self.autoSaveLbl.stringValue = String(format: "%.0f %@", AutoSaveManager.manager.timeInterval, KMLocalizedString("minute(s)", nil))
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        self.showLeftSideButton.state = KMPreference.shared.showLeftSideBar ? .on : .off
-        self.rememberSnapshotButton.state = KMPreference.shared.rememberSnapshot ? .on : .off
-        self.autoSaveNotesBackupButton.state = KMPreference.shared.autoSaveNoteBackup ? .on : .off
-        self.keepSnapshotOnTopButton.state = KMPreference.shared.keepSnapshotWindowToTop ? .on : .off
     }
     
     @IBAction func revertPDFViewSettings(_ sender: AnyObject?) {