【综合】密码窗口按钮调整为系统按钮

PDF Office/PDF Master/Class/PDFTools/Secure/Window/KMPasswordInputWindow.swift

@@ -196,15 +196,17 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
         
         if cancelButton != nil {
             for button in [cancelButton, confirmButton] {
-                button?.wantsLayer = true
-                button?.layer?.cornerRadius = 4
+//                button?.wantsLayer = true
+//                button?.layer?.cornerRadius = 4
+//                button?.bezelStyle = .roundRect
+//                button?.setButtonType(.momentaryPushIn)
                 
                 button!.target = self
                 if ((button?.isEqual(to: cancelButton))!) {
-                    button?.layer?.borderWidth = 1
-                    button?.layer?.borderColor = NSColor.buttonBorderColor().cgColor
+//                    button?.layer?.borderWidth = 1
+//                    button?.layer?.borderColor = NSColor.buttonBorderColor().cgColor
 //                    button?.title = NSLocalizedString("Cancel", comment: "")
-                    button?.title = ""
+//                    button?.title = ""
 //                    button?.setTitleColor(NSColor.buttonTitleColor())
 //                    button?.font = NSFont.SFProTextRegularFont(14)
 //                    button?.action = #selector(cancelButtonAction)
@@ -213,12 +215,12 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
 //                    button?.attributedTitle = NSMutableAttributedString(string: button!.title, attributes: [.foregroundColor : NSColor.white])
 //                    button?.font = NSFont.SFProTextRegularFont(14)
 //                    button?.action = #selector(confirmButtonAction)
-                    button?.title = ""
+//                    button?.title = ""
                 }
             }
             
             let cancelButtonVC = KMDesignButton(withType: .Text)
-            self.cancelButton.addSubview(cancelButtonVC.view)
+//            self.cancelButton.addSubview(cancelButtonVC.view)
             cancelButtonVC.view.frame = self.cancelButton.bounds
             cancelButtonVC.view.autoresizingMask = [.width, .height]
             cancelButtonVC.stringValue = NSLocalizedString("Cancel", comment: "")
@@ -226,9 +228,11 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
             cancelButtonVC.target = self
             cancelButtonVC.action = #selector(cancelButtonAction)
             cancelButtonVC.button.keyEquivalent = KMKeyEquivalent.esc.string()
+            self.cancelButton.title = NSLocalizedString("Cancel", comment: "")
+            self.cancelButton.action = #selector(cancelButtonAction)
             
             let confirmButtonVC = KMDesignButton(withType: .Text)
-            self.confirmButton.addSubview(confirmButtonVC.view)
+//            self.confirmButton.addSubview(confirmButtonVC.view)
             confirmButtonVC.view.frame = self.confirmButton.bounds
             confirmButtonVC.view.autoresizingMask = [.width, .height]
             confirmButtonVC.stringValue = NSLocalizedString("Open", comment: "")
@@ -237,6 +241,8 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
             confirmButtonVC.action = #selector(confirmButtonAction)
             self.confirmButtonVC = confirmButtonVC
             self.confirmButtonVC?.button.keyEquivalent = KMKeyEquivalent.enter
+            self.confirmButton.title = NSLocalizedString("Open", comment: "")
+            self.confirmButton.action = #selector(confirmButtonAction)
             
             dealConfirmButtonEnabledState(enabled: false)
         }
@@ -375,9 +381,10 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
 //            }
 //            confirmButton?.attributedTitle = NSMutableAttributedString(string: confirmButton!.title, attributes: [.foregroundColor : color])
             
-            if (self.confirmButtonVC != nil) {
-                self.confirmButtonVC?.enabled = enabled
-            }
+//            if (self.confirmButtonVC != nil) {
+//                self.confirmButtonVC?.enabled = enabled
+//            }
+            self.confirmButton.isEnabled = enabled
         }
     }
     

PDF Office/PDF Master/Class/PDFTools/Secure/Window/KMPasswordInputWindow.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -23,7 +23,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="432" height="220"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
             <value key="minSize" type="size" width="432" height="220"/>
             <value key="maxSize" type="size" width="432" height="220"/>
             <view key="contentView" wantsLayer="YES" misplaced="YES" id="EiT-Mj-1SZ">
@@ -36,7 +36,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="432" height="44"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X38-4p-51v">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X38-4p-51v">
                                     <rect key="frame" x="14" y="16" width="37" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="mNB-xx-ixe">
                                         <font key="font" usesAppearanceFont="YES"/>
@@ -66,7 +66,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="432" height="102"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="xRE-aR-QBJ">
+                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="xRE-aR-QBJ">
                                     <rect key="frame" x="102" y="80" width="316" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="height" relation="lessThanOrEqual" constant="66" id="Usx-e2-2hd"/>
@@ -83,7 +83,7 @@
                                         <constraint firstAttribute="height" constant="32" id="jiZ-zN-rn8"/>
                                     </constraints>
                                 </customView>
-                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="gST-4X-s69">
+                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="gST-4X-s69">
                                     <rect key="frame" x="102" y="16" width="304" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="300" id="N0S-qp-xpS"/>
@@ -128,32 +128,32 @@
                                     <rect key="frame" x="0.0" y="45" width="432" height="5"/>
                                 </box>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jwm-QT-mwz">
-                                    <rect key="frame" x="254" y="16" width="78" height="32"/>
-                                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="9ln-dP-nCD">
+                                    <rect key="frame" x="247" y="9" width="92" height="44"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="78" id="9On-lg-Ifu"/>
+                                        <constraint firstAttribute="height" constant="32" id="YVJ-Ck-tWB"/>
+                                    </constraints>
+                                    <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9ln-dP-nCD">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
                                         <string key="keyEquivalent" base64-UTF8="YES">
 Gw
 </string>
                                     </buttonCell>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="78" id="9On-lg-Ifu"/>
-                                        <constraint firstAttribute="height" constant="32" id="YVJ-Ck-tWB"/>
-                                    </constraints>
                                 </button>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dpd-lf-2h1">
-                                    <rect key="frame" x="348" y="16" width="68" height="32"/>
-                                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="uBB-Ls-gQs">
+                                    <rect key="frame" x="341" y="9" width="82" height="44"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="32" id="19C-1p-OYf"/>
+                                        <constraint firstAttribute="width" constant="68" id="OOr-ag-SdW"/>
+                                    </constraints>
+                                    <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="uBB-Ls-gQs">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
                                         <string key="keyEquivalent" base64-UTF8="YES">
 DQ
 </string>
                                     </buttonCell>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="19C-1p-OYf"/>
-                                        <constraint firstAttribute="width" constant="68" id="OOr-ag-SdW"/>
-                                    </constraints>
                                 </button>
                             </subviews>
                             <constraints>