ソースを参照

【偏好设置】KMDisplayPreferences 整理代码

tangchao 1 年間 前
コミット
283c3fc467

+ 21 - 5
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -7,16 +7,32 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "8CA08877-2321-4A13-99DF-37F2E44E4320"
+            uuid = "8A50A9B0-05C6-4F44-90A0-BB7EDAD9B880"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Preference/Controller/KMGeneralPreferences.swift"
+            filePath = "PDF Master/Class/Preference/Controller/KMDisplayPreferences.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "391"
-            endingLineNumber = "391"
-            landmarkName = "defaultsDidRevert()"
+            startingLineNumber = "197"
+            endingLineNumber = "197"
+            landmarkName = "comboBoxSelectionDidChange(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3D86A5D4-2323-4A07-958E-ECB922C37944"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Preference/Controller/KMDisplayPreferences.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "205"
+            endingLineNumber = "205"
+            landmarkName = "controlTextDidChange(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 10 - 6
PDF Office/PDF Master/Class/Preference/Controller/DisplayPreferences.xib

@@ -9,22 +9,26 @@
         <customObject id="-2" userLabel="File's Owner" customClass="KMDisplayPreferences" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="antiAliasCheckButton" destination="9" id="101"/>
-                <outlet property="colorControl1" destination="16" id="4VH-rQ-aQh"/>
-                <outlet property="colorControl2" destination="15" id="mXT-Tn-DxH"/>
-                <outlet property="colorControl3" destination="17" id="rO8-kH-MIn"/>
-                <outlet property="colorControl4" destination="23" id="u2w-ik-lQX"/>
-                <outlet property="colorControl5" destination="24" id="sAj-v2-oQu"/>
+                <outlet property="backgroundColorLabel" destination="13" id="gpv-xx-K0p"/>
                 <outlet property="discreteSizeCheckbox" destination="6" id="UuS-R3-NWc"/>
+                <outlet property="displayLabel" destination="12" id="n6e-iu-1AL"/>
+                <outlet property="fullScreenColorWell" destination="17" id="XfC-gi-IZe"/>
+                <outlet property="fullScreenLabel" destination="15" id="zOv-f9-wsL"/>
                 <outlet property="greekingLabelField" destination="11" id="88"/>
                 <outlet property="greekingTextField" destination="10" id="89"/>
+                <outlet property="invertBarButton" destination="24" id="IaJ-Qp-wNw"/>
                 <outlet property="normalColorLabel" destination="14" id="daq-AW-7rq"/>
+                <outlet property="normalColorWell" destination="16" id="9Sh-2N-iB5"/>
                 <outlet property="pagesLabel" destination="2" id="I9C-bM-UbM"/>
                 <outlet property="pagesSlider" destination="3" id="TP7-Qv-sKL"/>
+                <outlet property="readBarColorWell" destination="23" id="MaK-yT-7AC"/>
+                <outlet property="readBarLabel" destination="22" id="hZx-Ia-jCe"/>
                 <outlet property="readingbarColorLabel" destination="25" id="sWY-2L-hjx"/>
                 <outlet property="snapshotLabel" destination="4" id="9nB-5o-dYN"/>
                 <outlet property="snapshotSlider" destination="5" id="2lw-as-Icg"/>
                 <outlet property="tableFontComboBox" destination="29" id="90"/>
                 <outlet property="tableFontLabelField" destination="28" id="91"/>
+                <outlet property="thumbSizeLabel" destination="7" id="diK-Qz-Afl"/>
                 <outlet property="view" destination="1" id="81"/>
             </connections>
         </customObject>
@@ -265,7 +269,7 @@
                     </connections>
                 </comboBox>
             </subviews>
-            <point key="canvasLocation" x="-3" y="154"/>
+            <point key="canvasLocation" x="82" y="86"/>
         </customView>
         <userDefaultsController representsSharedInstance="YES" id="61"/>
         <customObject id="108" userLabel="Thumbnail Size Labels"/>

+ 89 - 19
PDF Office/PDF Master/Class/Preference/Controller/KMDisplayPreferences.swift

@@ -9,31 +9,36 @@ import Cocoa
 
 @objcMembers class KMDisplayPreferences: NSViewController {
     
+    @IBOutlet weak var thumbSizeLabel: NSTextField!
+    @IBOutlet weak var pagesLabel: NSTextField!
+    @IBOutlet weak var pagesSlider: NSSlider!
+    @IBOutlet weak var snapshotLabel: NSTextField!
+    @IBOutlet weak var snapshotSlider: NSSlider!
+    @IBOutlet weak var discreteSizeCheckbox: NSButton!
+    
     @IBOutlet var tableFontLabelField: NSTextField!
     @IBOutlet var tableFontComboBox: NSComboBox!
+    
+    @IBOutlet weak var displayLabel: NSTextField!
     @IBOutlet var greekingLabelField: NSTextField!
     @IBOutlet var greekingTextField: NSTextField!
     @IBOutlet var antiAliasCheckButton: NSButton!
     
-    @IBOutlet weak var pagesLabel: NSTextField!
-    @IBOutlet weak var snapshotLabel: NSTextField!
-    var thumbnailSizeLabels: [NSTextField] = []
+    @IBOutlet weak var backgroundColorLabel: NSTextField!
+    @IBOutlet weak var normalColorLabel: NSTextField!
+    @IBOutlet weak var normalColorWell: NSColorWell!
+    @IBOutlet weak var fullScreenLabel: NSTextField!
+    @IBOutlet weak var fullScreenColorWell: NSColorWell!
     
-    @IBOutlet weak var pagesSlider: NSSlider!
-    @IBOutlet weak var snapshotSlider: NSSlider!
-    @IBOutlet weak var discreteSizeCheckbox: NSButton!
+    @IBOutlet weak var readBarLabel: NSTextField!
+    @IBOutlet weak var readingbarColorLabel: NSTextField!
+    @IBOutlet weak var readBarColorWell: NSColorWell!
+    @IBOutlet weak var invertBarButton: NSButton!
+   
+    var thumbnailSizeLabels: [NSTextField] = []
     var thumbnailSizeControls: [NSControl] = []
     
-    @IBOutlet weak var normalColorLabel: NSTextField!
-    @IBOutlet weak var readingbarColorLabel: NSTextField!
     var colorLabels: [NSTextField] = []
-    
-    
-    @IBOutlet weak var colorControl1: NSColorWell!
-    @IBOutlet weak var colorControl2: NSTextField!
-    @IBOutlet weak var colorControl3: NSColorWell!
-    @IBOutlet weak var colorControl4: NSColorWell!
-    @IBOutlet weak var colorControl5: NSButton!
     var colorControls: [NSControl] = []
     /*
      - (NSUInteger)countOfSizes;
@@ -57,10 +62,10 @@ import Cocoa
         _ = KMAutoSizeLabelFields([self.greekingLabelField], [self.greekingTextField], false)
         self.antiAliasCheckButton.sizeToFit()
         self.colorLabels = [self.normalColorLabel, self.readingbarColorLabel]
-        self.colorControls = [self.colorControl1, self.colorControl2, self.colorControl3, self.colorControl4, self.colorControl5]
+        self.colorControls = [self.normalColorWell, self.fullScreenLabel, self.fullScreenColorWell, self.readBarColorWell, self.invertBarButton]
         _ = KMAutoSizeLabelFields(self.colorLabels, self.colorControls, false)
-        _ = KMAutoSizeLabelFields([self.colorControl2], [self.colorControl3], false);
-        self.colorControl5.sizeToFit()
+        _ = KMAutoSizeLabelFields([self.fullScreenLabel], [self.fullScreenColorWell], false);
+        self.invertBarButton.sizeToFit()
         
         var w = 0.0
         for view in self.view.subviews {
@@ -83,8 +88,29 @@ import Cocoa
         super.viewDidLoad()
         // Do view setup here.
         
+        self.pagesSlider.target = self
+        self.pagesSlider.action = #selector(pageSliderAction)
+        self.snapshotSlider.target = self
+        self.snapshotSlider.action = #selector(snapshotSliderAction)
+        
         self.tableFontComboBox.addItems(withObjectValues: SKDefaultFontSizes)
         self.tableFontComboBox.selectItem(at: 4)
+        self.tableFontComboBox.delegate = self
+        
+        self.greekingTextField.delegate = self
+        self.antiAliasCheckButton.target = self
+        self.antiAliasCheckButton.action = #selector(antiAliasCheckAction)
+        
+        self.normalColorWell.target = self
+        self.normalColorWell.action = #selector(normalColorAction)
+        self.fullScreenColorWell.target = self
+        self.fullScreenColorWell.action = #selector(fullScreenColorAction)
+        
+        self.readBarColorWell.target = self
+        self.readBarColorWell.action = #selector(readBarColorAction)
+        
+        self.invertBarButton.target = self
+        self.invertBarButton.action = #selector(invertBarAction)
     }
     
     override var title: String? {
@@ -96,6 +122,14 @@ import Cocoa
         }
     }
     
+    @objc func pageSliderAction(_ sender: NSSlider) {
+        
+    }
+    
+    @objc func snapshotSliderAction(_ sender: NSSlider) {
+        
+    }
+    
     @IBAction func changeDiscreteThumbnailSizes(_ sender: AnyObject?) {
         let slider1 = self.pagesSlider
         let slider2 = self.snapshotSlider
@@ -118,6 +152,26 @@ import Cocoa
         slider2?.sizeToFit()
     }
     
+    @objc func antiAliasCheckAction(_ sender: NSButton) {
+        
+    }
+    
+    @objc func normalColorAction(_ sender: NSColorWell) {
+        
+    }
+    
+    @objc func fullScreenColorAction(_ sender: NSColorWell) {
+        
+    }
+    
+    @objc func readBarColorAction(_ sender: NSColorWell) {
+        
+    }
+    
+    @objc func invertBarAction(_ sender: NSButton) {
+        
+    }
+    
     /*
      - (NSUInteger)countOfSizes {
          return sizeof(SKDefaultFontSizes) / sizeof(CGFloat);
@@ -132,6 +186,22 @@ import Cocoa
 
 extension KMDisplayPreferences: KMPreferencePane {
     func defaultsDidRevert() {
-        
+        // no things.
+    }
+}
+
+extension KMDisplayPreferences: NSComboBoxDelegate {
+    func comboBoxSelectionDidChange(_ notification: Notification) {
+        if self.tableFontComboBox.isEqual(to: notification.object) {
+            
+        }
+    }
+}
+
+extension KMDisplayPreferences: NSTextFieldDelegate {
+    func controlTextDidChange(_ obj: Notification) {
+        if self.greekingTextField.isEqual(to: obj.object) {
+            
+        }
     }
 }