Merge branch 'develop_PDFReaderProV4.6.0_appStore' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProV4.6.0_appStore

PDF Office/PDF Master/Class/AIInfo/AIConfigWindowController/Views/AIInfoInputView/AIInfoInputView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" 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="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -22,7 +22,7 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="6CO-V7-P4Z">
                                 <rect key="frame" x="0.0" y="0.0" width="238" height="245"/>
                                 <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sz6-fP-Bdb">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sz6-fP-Bdb">
                                         <rect key="frame" x="6" y="221" width="124" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="选择需要使用的工具" id="dJu-ok-6Gz">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -42,7 +42,7 @@
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="y7L-XQ-ePy">
                                         <rect key="frame" x="0.0" y="221" width="238" height="24"/>
                                         <subviews>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Wj-F1-dBg">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Wj-F1-dBg">
                                                 <rect key="frame" x="6" y="4" width="37" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="LAJ-dW-gv1">
                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -59,14 +59,14 @@
                                             </button>
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="0vw-Pt-XuK">
                                                 <rect key="frame" x="214" y="4" width="16" height="16"/>
-                                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="aiTextClose" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="y9h-U2-9FO">
-                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="system"/>
-                                                </buttonCell>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="16" id="HeR-Wc-V1d"/>
                                                     <constraint firstAttribute="width" constant="16" id="XlK-Gq-dro"/>
                                                 </constraints>
+                                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="aiTextClose" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="y9h-U2-9FO">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
                                                 <connections>
                                                     <action selector="clearInputStringAction:" target="c22-O7-iKe" id="jab-YX-zEd"/>
                                                 </connections>
@@ -85,7 +85,7 @@
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Tld-qg-AAs">
                                         <rect key="frame" x="0.0" y="32" width="238" height="185"/>
                                         <subviews>
-                                            <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dSN-RY-s4T">
+                                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dSN-RY-s4T">
                                                 <rect key="frame" x="10" y="155" width="228" height="32"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="224" id="6s5-gx-pwz"/>
@@ -139,7 +139,7 @@
                                                         </constraints>
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="ic_else_alert" id="Dh6-Iw-zHM"/>
                                                     </imageView>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gTS-09-xht">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gTS-09-xht">
                                                         <rect key="frame" x="24" y="8" width="194" height="16"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="190" id="0MZ-vx-2fb"/>
@@ -166,12 +166,13 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <textView wantsLayer="YES" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="HF1-Pc-Fff" customClass="customTextView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                            <rect key="frame" x="0.0" y="0.0" width="222" height="169"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="0.0" height="169"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             <size key="minSize" width="222" height="169"/>
                                                             <size key="maxSize" width="385" height="10000000"/>
+                                                            <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                         </textView>
                                                     </subviews>
                                                 </clipView>
@@ -190,7 +191,7 @@
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="z3M-0o-bfB">
                                                         <rect key="frame" x="0.0" y="0.0" width="61" height="20"/>
                                                         <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="awg-zk-OOg">
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="awg-zk-OOg">
                                                                 <rect key="frame" x="6" y="2" width="37" height="16"/>
                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="dZ8-fk-3O1">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -243,7 +244,7 @@
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ek7-fa-Yrv">
                                                         <rect key="frame" x="87" y="0.0" width="61" height="20"/>
                                                         <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="afk-d4-8cf">
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="afk-d4-8cf">
                                                                 <rect key="frame" x="6" y="2" width="37" height="16"/>
                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="ls7-Pa-Kn8">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -307,7 +308,7 @@
                                                         </constraints>
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="ic_propertybar_file_pdf" id="9yq-c5-Xp9"/>
                                                     </imageView>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="POe-MA-3Cr">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="POe-MA-3Cr">
                                                         <rect key="frame" x="42" y="30" width="172" height="16"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="168" id="fnM-KA-hiY"/>
@@ -318,7 +319,7 @@
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D1d-zo-pBW">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D1d-zo-pBW">
                                                         <rect key="frame" x="42" y="10" width="37" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="AUp-s3-0NI">
                                                             <font key="font" metaFont="system"/>
@@ -326,7 +327,7 @@
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l6f-Zr-7WC">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l6f-Zr-7WC">
                                                         <rect key="frame" x="83" y="10" width="37" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="pq1-Ar-zaK">
                                                             <font key="font" metaFont="system"/>
@@ -350,14 +351,14 @@
                                             </customView>
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="Vj8-am-8Gm">
                                                 <rect key="frame" x="218" y="140" width="20" height="20"/>
-                                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="aiPDF_Clear" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="V8Q-CY-OqW">
-                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="system"/>
-                                                </buttonCell>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="Phs-Z3-91k"/>
                                                     <constraint firstAttribute="width" constant="20" id="QDu-7B-heo"/>
                                                 </constraints>
+                                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="aiPDF_Clear" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="V8Q-CY-OqW">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
                                                 <connections>
                                                     <action selector="removeChooseFile:" target="c22-O7-iKe" id="enL-rL-Sz0"/>
                                                 </connections>
@@ -388,7 +389,7 @@
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="rB9-d1-Cdg">
                                         <rect key="frame" x="0.0" y="0.0" width="238" height="32"/>
                                         <subviews>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="x8R-lQ-xRW">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="x8R-lQ-xRW">
                                                 <rect key="frame" x="10" y="8" width="49" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="0/2000" id="Geq-53-8fy">
                                                     <font key="font" metaFont="system"/>

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.swift

@@ -62,11 +62,11 @@ class CPDFListEditAnnotationViewController: NSViewController, NSTextViewDelegate
         let box = self.borderBox
         if self.annotation.color != nil {
             box?.borderColor = self.annotation.color
-            self.contentTextView.insertionPointColor = self.annotation.color
         } else {
             box?.borderColor = NSColor.white
-            self.contentTextView.insertionPointColor = NSColor.black
         }
+        contentTextView.insertionPointColor = KMAppearance.titleColor()
+
         box?.fillColor = KMAppearance.Layout.l1Color()
         self.colors.removeAll()
         var i = 0
@@ -179,12 +179,11 @@ class CPDFListEditAnnotationViewController: NSViewController, NSTextViewDelegate
         
         if let annotationColor = annotation.color {
             borderBox.borderColor = annotationColor
-            contentTextView.insertionPointColor = annotationColor
         } else {
             borderBox.borderColor = .white
-            contentTextView.insertionPointColor = .black
         }
-        
+        contentTextView.insertionPointColor = KMAppearance.titleColor()
+
         if let changeColorCallBack1 = self.changeColorCallBack {
             changeColorCallBack1()
         }