【PDFull】配色修改，移除广告弹窗，激活状态判断恢复

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Batch/KMImageNameUXIconBatchConvert.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "light_ic_batch_convert.pdf",
+      "filename" : "Status=nor.pdf",
       "idiom" : "mac"
     },
     {

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Batch/KMImageNameUXIconBatchConvert.imageset/Status=nor.pdf

@@ -0,0 +1,91 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.496582 1.250000 cm
+0.439216 0.392157 1.000000 scn
+3.207106 13.510660 m
+6.414213 10.303553 l
+5.353524 9.242864 l
+3.960525 10.636331 l
+3.960118 1.500000 l
+16.057106 1.500000 l
+16.057106 0.000000 l
+2.460686 0.000000 l
+2.460561 10.644025 l
+1.060748 9.242805 l
+0.000000 10.303553 l
+3.207106 13.510660 l
+h
+2.960683 17.500000 m
+16.557152 17.500000 l
+16.556587 6.858989 l
+17.952841 8.256561 l
+19.014631 7.197285 l
+15.814280 3.989339 l
+12.600418 7.195611 l
+13.659853 8.257554 l
+15.056587 6.863653 l
+15.057093 16.000000 l
+2.960683 16.000000 l
+2.960683 17.500000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  632
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000722 00000 n
+0000000744 00000 n
+0000000917 00000 n
+0000000991 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1050
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Batch/KMImageNameUXIconBatchConvertNor.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "light_ic_batch_convert.pdf",
+      "filename" : "Status=nor.pdf",
       "idiom" : "mac"
     },
     {

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Batch/KMImageNameUXIconBatchConvertNor.imageset/Status=nor.pdf

@@ -0,0 +1,91 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.496582 1.250000 cm
+0.439216 0.392157 1.000000 scn
+3.207106 13.510660 m
+6.414213 10.303553 l
+5.353524 9.242864 l
+3.960525 10.636331 l
+3.960118 1.500000 l
+16.057106 1.500000 l
+16.057106 0.000000 l
+2.460686 0.000000 l
+2.460561 10.644025 l
+1.060748 9.242805 l
+0.000000 10.303553 l
+3.207106 13.510660 l
+h
+2.960683 17.500000 m
+16.557152 17.500000 l
+16.556587 6.858989 l
+17.952841 8.256561 l
+19.014631 7.197285 l
+15.814280 3.989339 l
+12.600418 7.195611 l
+13.659853 8.257554 l
+15.056587 6.863653 l
+15.057093 16.000000 l
+2.960683 16.000000 l
+2.960683 17.500000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  632
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000722 00000 n
+0000000744 00000 n
+0000000917 00000 n
+0000000991 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1050
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Home/KMImageNameUXIconHomeViewlistPre.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "light_ic_home_viewlist_pre.pdf",
+      "filename" : "viewlist.pdf",
       "idiom" : "mac"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "ic_home_viewlist_pre.pdf",
+      "filename" : "viewlist 1.pdf",
       "idiom" : "mac"
     }
   ],

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Home/KMImageNameUXIconHomeViewlistPre.imageset/viewlist 1.pdf

@@ -0,0 +1,77 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.500000 2.500000 cm
+0.439216 0.392157 1.000000 scn
+15.000000 15.000000 m
+0.000000 15.000000 l
+0.000000 10.000000 l
+15.000000 10.000000 l
+15.000000 15.000000 l
+h
+15.000000 5.000000 m
+0.000000 5.000000 l
+0.000000 0.000000 l
+15.000000 0.000000 l
+15.000000 5.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  341
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000431 00000 n
+0000000453 00000 n
+0000000626 00000 n
+0000000700 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+759
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Home/KMImageNameUXIconHomeViewlistPre.imageset/viewlist.pdf

@@ -0,0 +1,77 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.500000 2.500000 cm
+0.439216 0.392157 1.000000 scn
+15.000000 15.000000 m
+0.000000 15.000000 l
+0.000000 10.000000 l
+15.000000 10.000000 l
+15.000000 15.000000 l
+h
+15.000000 5.000000 m
+0.000000 5.000000 l
+0.000000 0.000000 l
+15.000000 0.000000 l
+15.000000 5.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  341
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000431 00000 n
+0000000453 00000 n
+0000000626 00000 n
+0000000700 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+759
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Home/KMImageNameUXIconHomeViewthumbnailPre.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "light_ic_home_viewthumbnail_pre.pdf",
+      "filename" : "ic_home_viewthumbnail_pre 1.pdf",
       "idiom" : "mac"
     },
     {

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Home/KMImageNameUXIconHomeViewthumbnailPre.imageset/ic_home_viewthumbnail_pre 1.pdf

@@ -0,0 +1,89 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.000000 2.000000 cm
+0.439216 0.392157 1.000000 scn
+6.000000 16.000000 m
+0.000000 16.000000 l
+0.000000 10.000000 l
+6.000000 10.000000 l
+6.000000 16.000000 l
+h
+6.000000 6.000000 m
+0.000000 6.000000 l
+0.000000 0.000000 l
+6.000000 0.000000 l
+6.000000 6.000000 l
+h
+10.000000 16.000000 m
+16.000000 16.000000 l
+16.000000 10.000000 l
+10.000000 10.000000 l
+10.000000 16.000000 l
+h
+16.000000 6.000000 m
+10.000000 6.000000 l
+10.000000 0.000000 l
+16.000000 0.000000 l
+16.000000 6.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  554
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000644 00000 n
+0000000666 00000 n
+0000000839 00000 n
+0000000913 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+972
+%%EOF

PDF Office/PDF Master/Class/Batch/WindowController/Base/KMBatchOperateBaseViewController.xib

@@ -1,12 +1,12 @@
 <?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="22505" 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="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchOperateBaseViewController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchOperateBaseViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>

PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.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="22505" 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="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateSplitViewController.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="22505" 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="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateWindowController.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="22505" 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="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,10 +13,10 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="KMBatchWindow" customModule="PDF_Master" customModuleProvider="target">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="KMBatchWindow" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="463" y="248" width="480" height="270"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
                 <autoresizingMask key="autoresizingMask"/>

PDF Office/PDF Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.xib

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="System colors introduced in macOS 10.13" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMConvertBaseWindowController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMConvertBaseWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="backBox" destination="gFg-Q7-54m" id="8ww-CO-9PP"/>
                 <outlet property="batchButton" destination="iFO-Ki-C0L" id="KTA-dQ-WkN"/>
@@ -32,7 +32,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="586" height="483"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <value key="minSize" type="size" width="586" height="483"/>
             <value key="maxSize" type="size" width="586" height="483"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -45,7 +45,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="586" height="44"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FhR-40-9KK">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FhR-40-9KK">
                                     <rect key="frame" x="14" y="10" width="44" height="19"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="i7C-Qe-kqF">
                                         <font key="font" metaFont="system" size="16"/>
@@ -69,13 +69,13 @@
                             <rect key="frame" x="0.0" y="0.0" width="212" height="320"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="mvl-fd-L7y" customClass="KMCustomPDFView" customModule="PDF_Master" customModuleProvider="target">
+                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="mvl-fd-L7y" customClass="KMCustomPDFView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="16" y="56" width="182" height="248"/>
                                 </customView>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="XyN-M5-Ckr">
                                     <rect key="frame" x="56" y="16" width="56" height="24"/>
                                     <subviews>
-                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0fT-PL-boX">
+                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0fT-PL-boX">
                                             <rect key="frame" x="8" y="2" width="40" height="21"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="PMO-9h-eKH">
                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -92,7 +92,7 @@
                                         <constraint firstItem="0fT-PL-boX" firstAttribute="centerY" secondItem="XyN-M5-Ckr" secondAttribute="centerY" id="t3M-pb-lv4"/>
                                     </constraints>
                                 </customView>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OjN-CY-T87">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OjN-CY-T87">
                                     <rect key="frame" x="118" y="18" width="9" height="20"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="/" id="B2h-9Y-2H7">
                                         <font key="font" metaFont="system" size="17"/>
@@ -100,7 +100,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b9V-3O-PC8">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b9V-3O-PC8">
                                     <rect key="frame" x="131" y="20" width="32" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="width" relation="lessThanOrEqual" constant="28" id="Iqf-l4-eTt"/>
@@ -280,7 +280,7 @@
             </connections>
             <point key="canvasLocation" x="13" y="100.5"/>
         </window>
-        <customView id="LzC-nd-jo2" customClass="KMConvertWordSettingView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="LzC-nd-jo2" customClass="KMConvertWordSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="276" height="250"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -290,7 +290,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="276" height="88"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="whh-eW-WBM">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="whh-eW-WBM">
                                 <rect key="frame" x="14" y="67" width="35" height="15"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="ROy-KL-lN4">
                                     <font key="font" metaFont="cellTitle"/>
@@ -298,13 +298,13 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="sIu-Jp-911" customClass="KMImageTitleButton" customModule="PDF_Master" customModuleProvider="target">
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="sIu-Jp-911" customClass="KMImageTitleButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                 <rect key="frame" x="16" y="37" width="244" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="vJn-IG-4gT"/>
                                 </constraints>
                             </customView>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="y6s-OJ-cG8" customClass="KMImageTitleButton" customModule="PDF_Master" customModuleProvider="target">
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="y6s-OJ-cG8" customClass="KMImageTitleButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                 <rect key="frame" x="16" y="7" width="244" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="obd-W8-at7"/>
@@ -367,11 +367,11 @@
             </connections>
             <point key="canvasLocation" x="118" y="543"/>
         </customView>
-        <customView id="rMz-DL-eLf" customClass="KMConvertOCRSettingItemView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="rMz-DL-eLf" customClass="KMConvertOCRSettingItemView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="276" height="86"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hUX-cE-if5">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hUX-cE-if5">
                     <rect key="frame" x="14" y="71" width="35" height="15"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="tdB-aW-iJn">
                         <font key="font" metaFont="cellTitle"/>
@@ -420,11 +420,11 @@
             </connections>
             <point key="canvasLocation" x="436" y="466"/>
         </customView>
-        <customView id="pQ2-zT-XVA" customClass="KMConvertPageRangeSettingItemView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="pQ2-zT-XVA" customClass="KMConvertPageRangeSettingItemView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="280" height="76"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yO0-Oi-VYM">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yO0-Oi-VYM">
                     <rect key="frame" x="14" y="60" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Z4k-2p-kHi">
                         <font key="font" usesAppearanceFont="YES"/>
@@ -458,7 +458,7 @@
             </connections>
             <point key="canvasLocation" x="438" y="599"/>
         </customView>
-        <customView id="Aiu-IG-eq4" customClass="KMConvertImageSettingView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="Aiu-IG-eq4" customClass="KMConvertImageSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="276" height="250"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -468,7 +468,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="276" height="80"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ezu-db-Vdi">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ezu-db-Vdi">
                                 <rect key="frame" x="14" y="65" width="35" height="15"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="50D-1S-EUR">
                                     <font key="font" metaFont="cellTitle"/>
@@ -506,7 +506,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="276" height="80"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="F2Q-wA-eBY">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="F2Q-wA-eBY">
                                 <rect key="frame" x="14" y="64" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="bMK-zp-HOX">
                                     <font key="font" usesAppearanceFont="YES"/>
@@ -569,7 +569,7 @@
             </connections>
             <point key="canvasLocation" x="118" y="839.5"/>
         </customView>
-        <customView id="Gcl-gP-wFo" customClass="KMConvertCSVSettingView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="Gcl-gP-wFo" customClass="KMConvertCSVSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="276" height="250"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -586,7 +586,7 @@
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
-                            <comboBox hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uah-L1-IyT">
+                            <comboBox hidden="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uah-L1-IyT">
                                 <rect key="frame" x="31" y="-22" width="215" height="23"/>
                                 <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="X1R-ss-GZO">
                                     <font key="font" metaFont="system"/>
@@ -653,7 +653,7 @@
             </connections>
             <point key="canvasLocation" x="118" y="1154"/>
         </customView>
-        <customView id="xUu-ga-ZZ7" customClass="KMConvertPPTsSettingView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="xUu-ga-ZZ7" customClass="KMConvertPPTsSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="276" height="250"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -692,7 +692,7 @@
             </connections>
             <point key="canvasLocation" x="118" y="1465"/>
         </customView>
-        <customView id="CNe-Pz-PVB" customClass="KMConvertExcelSettingView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="CNe-Pz-PVB" customClass="KMConvertExcelSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="270" height="370"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -702,7 +702,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="270" height="200"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MHF-XE-yf0">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MHF-XE-yf0">
                                 <rect key="frame" x="14" y="184" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Z4s-Tq-fFY">
                                     <font key="font" usesAppearanceFont="YES"/>

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

@@ -51,7 +51,7 @@ typealias KMPasswordInputWindowItemClick = (KMPasswordInputWindow, Int, String)
             let ps = NSMutableParagraphStyle()
             ps.lineSpacing = 5
             let despLabelString = "\"\(fileName)\"\(NSLocalizedString("This PDF is password protected. Please enter the password below to access this PDF.", comment: ""))"
-            self.despLabel?.attributedStringValue = NSAttributedString(string: despLabelString, attributes: [.foregroundColor : KMAppearance.Layout.h0Color(), .font : NSFont.SFProTextRegularFont(14), .paragraphStyle : ps])
+            self.despLabel?.attributedStringValue = NSAttributedString(string: despLabelString, attributes: [.foregroundColor : KMAppearance.Layout.mColor(), .font : NSFont.SFProTextRegularFont(14), .paragraphStyle : ps])
         }
     }
     
@@ -130,13 +130,13 @@ typealias KMPasswordInputWindowItemClick = (KMPasswordInputWindow, Int, String)
         self.despLabel.maximumNumberOfLines = 2
         self.despLabel.lineBreakMode = .byTruncatingTail
             ps.lineBreakMode = .byTruncatingTail
-        self.despLabel.attributedStringValue = NSAttributedString(string: despLabel.stringValue, attributes: [.foregroundColor : KMAppearance.Layout.h0Color(), .font : NSFont.SFProTextRegularFont(14), .paragraphStyle : ps])
+        self.despLabel.attributedStringValue = NSAttributedString(string: despLabel.stringValue, attributes: [.foregroundColor : KMAppearance.Layout.mColor(), .font : NSFont.SFProTextRegularFont(14), .paragraphStyle : ps])
         
         self.iconImageView.image = NSImage(named: "KMImageNameSecureIcon")
 
         self.secureTextFiled.backgroundView.wantsLayer = true
         self.secureTextFiled.backgroundView.layer?.borderWidth = 1
-        self.secureTextFiled.backgroundView.layer?.borderColor = NSColor.buttonBorderColor().cgColor
+        self.secureTextFiled.backgroundView.layer?.borderColor = KMAppearance.Layout.mColor().cgColor
         self.secureTextFiled.backgroundView.layer?.cornerRadius = 4
         self.secureTextFiled.placeholderString = NSLocalizedString("Password", comment: "")
             
@@ -156,7 +156,7 @@ typealias KMPasswordInputWindowItemClick = (KMPasswordInputWindow, Int, String)
         self.secureTextFiled.becomeFirstResponderHandler = { [unowned self] securetextFiled in
             let mySecureTextField: KMSecureTextFiled = securetextFiled as! KMSecureTextFiled
             mySecureTextField.backgroundView.wantsLayer = true
-            mySecureTextField.backgroundView.layer?.borderColor = NSColor.km_init(hex: "#1770F4").cgColor
+            mySecureTextField.backgroundView.layer?.borderColor = KMAppearance.Layout.mColor().cgColor
                 
             if mySecureTextField.password().isEmpty {
                 self.secureTextFiled.rightView?.isHidden = true
@@ -166,7 +166,7 @@ typealias KMPasswordInputWindowItemClick = (KMPasswordInputWindow, Int, String)
             self.passwordErrorLabel.isHidden = true
         }
         self.secureTextFiled.valueDidChange = { [unowned self] view, string in
-            view.backgroundView.layer?.borderColor = NSColor.km_init(hex: "#1770F4").cgColor
+            view.backgroundView.layer?.borderColor = KMAppearance.Layout.mColor().cgColor
             self.passwordErrorLabel.isHidden = true
             if string.isEmpty {
                 view.rightView?.isHidden = true
@@ -344,7 +344,7 @@ typealias KMPasswordInputWindowItemClick = (KMPasswordInputWindow, Int, String)
         super.mouseUp(with: event)
         
         self.makeFirstResponder(nil)
-        self.secureTextFiled.backgroundView.layer?.borderColor = NSColor.buttonBorderColor().cgColor
+        self.secureTextFiled.backgroundView.layer?.borderColor = KMAppearance.Layout.mColor().cgColor
         self.passwordErrorLabel.isHidden = true
     }
 }

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="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <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="1680" height="1025"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <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 horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X38-4p-51v">
+                                <textField focusRingType="none" 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 verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="xRE-aR-QBJ">
+                                <textField focusRingType="none" 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 verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="gST-4X-s69">
+                                <textField focusRingType="none" 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"/>
@@ -129,10 +129,6 @@
                                 </box>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jwm-QT-mwz">
                                     <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"/>
@@ -140,13 +136,13 @@
 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="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"/>
@@ -154,6 +150,10 @@ Gw
 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>

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/LeftSideView.xib

@@ -163,7 +163,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <clipView key="contentView" drawsBackground="NO" id="fXK-1u-PsQ">
                 <rect key="frame" x="0.0" y="0.0" width="201" height="405"/>
-                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="86" rowSizeStyle="automatic" viewBased="YES" id="101" customClass="KMThumbnailTableView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="0.0" width="201" height="405"/>
@@ -1129,7 +1129,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="z3N-jy-sfp">
                 <rect key="frame" x="0.0" y="0.0" width="251" height="429"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" tableStyle="plain" typeSelect="NO" autosaveName="KMNoteOutlineView" rowHeight="92" usesAutomaticRowHeights="YES" viewBased="YES" indentationPerLevel="16" outlineTableColumn="yso-Z1-ZNZ" id="ZeT-gb-jMM" customClass="KMNoteOutlineView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="0.0" width="251" height="429"/>
@@ -1349,7 +1349,7 @@
         <image name="KMImageNameUXIconBtnSidebarZoominNor" width="16" height="16"/>
         <image name="KMImageNameUXIconBtnSidebarZoomoutNor" width="16" height="16"/>
         <namedColor name="KMColor_Layout_H2">
-            <color red="0.45882352941176469" green="0.46666666666666667" blue="0.50196078431372548" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Outline/OutlineView/View/KMTocTableCellView.swift

@@ -17,5 +17,7 @@ class KMTocTableCellView: NSTableCellView {
         self.wantsLayer = true
         self.layer?.backgroundColor = .clear
         self.layer?.cornerRadius = 0
+        
+        pageLabel.textColor = KMAppearance.Layout.mColor()
     }
 }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -484,6 +484,13 @@ let KMColorPickerViewHeight: CGFloat = 64
             opacity = (annotationModel?.opacity()) ?? self.kDefaultOpacity_
         }
 
+        lineWidthSlider.trackFillColor = KMAppearance.Layout.mColor()
+        widthSlider.trackFillColor = KMAppearance.Layout.mColor()
+        opacitySlider.trackFillColor = KMAppearance.Layout.mColor()
+        
+        lineWidthSlider.controlSize = .small
+        widthSlider.controlSize = .small
+        opacitySlider.controlSize = .small
         
         opacitySlider.floatValue = Float(opacity)
         opacitySlider.toolTip = "\(Int(opacity * 100))%"

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationButtonWidgetAppearanceViewController.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -81,6 +82,7 @@
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="cellTitle"/>
                                         </buttonCell>
+                                        <color key="contentTintColor" name="KMColor_Layout_M"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="17" id="jzL-se-DbA"/>
                                         </constraints>
@@ -270,5 +272,8 @@
     </objects>
     <resources>
         <image name="KMImageNameUXIconBtnFontsetNor" width="17" height="16"/>
+        <namedColor name="KMColor_Layout_M">
+            <color red="0.4392156862745098" green="0.39215686274509803" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationButtonWidgetOptionsViewController.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -40,6 +41,7 @@
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
+                                        <color key="contentTintColor" name="KMColor_Layout_M"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="17" id="7ji-Pr-URV"/>
                                         </constraints>
@@ -155,5 +157,8 @@
     </objects>
     <resources>
         <image name="KMImageNameElseAlert" width="14" height="14"/>
+        <namedColor name="KMColor_Layout_M">
+            <color red="0.4392156862745098" green="0.39215686274509803" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationTextWidgetOptionsViewController.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -94,6 +95,7 @@
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
+                                        <color key="contentTintColor" name="KMColor_Layout_M"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="17" id="gHX-Tv-13P"/>
                                         </constraints>
@@ -118,6 +120,7 @@
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
+                                        <color key="contentTintColor" name="KMColor_Layout_M"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="17" id="8jd-2k-xQj"/>
                                         </constraints>
@@ -170,4 +173,9 @@
             <point key="canvasLocation" x="-119.5" y="83"/>
         </scrollView>
     </objects>
+    <resources>
+        <namedColor name="KMColor_Layout_M">
+            <color red="0.4392156862745098" green="0.39215686274509803" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/PageDisplay/KMPageDisplayPropertiesViewController.swift

@@ -139,6 +139,9 @@ class KMPageDisplayPropertiesButton: NSButton {
         readModeButton.wantsLayer = true
         continuousScrollButton.title = NSLocalizedString("Continuous Scroll", comment: "")
         pageBreaksButton.title = NSLocalizedString("Page Breaks", comment: "")
+         
+        continuousScrollButton.contentTintColor = KMAppearance.Layout.mColor()
+        pageBreaksButton.contentTintColor = KMAppearance.Layout.mColor()
 
         splitViewLabel.stringValue = NSLocalizedString("Split View", comment: "")
         splitViewLabel.textColor = KMAppearance.Layout.h0Color()

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift

@@ -585,6 +585,10 @@ class KMEditImagePropertyViewController: NSViewController {
         self.cancelVC?.stringValue = NSLocalizedString("Cancel", comment: "")
         self.replaceVC?.stringValue = NSLocalizedString("Replace", comment: "")
         self.exportVC?.stringValue = NSLocalizedString("Export", comment: "")
+        
+        self.opacitySlider.trackFillColor = KMAppearance.Layout.mColor()
+        self.opacitySlider.controlSize = .small
+        
     }
     
     func reloadData() {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.swift

@@ -382,6 +382,9 @@ let KMPDFDynamicStampNeedAuthorKey1 = "km_pdfview_dynamic_stamp_need_author"
         rotateLabel.stringValue = NSLocalizedString("Rotate", comment: "")
         annotationLabel.stringValue = NSLocalizedString("Note", comment: "")
         annotationLabel.textColor = KMAppearance.Layout.h0Color()
+         
+        opacitySlider.trackFillColor = KMAppearance.Layout.mColor()
+        opacitySlider.controlSize = .small
         
         var opacity = 1.0
         if annotationModel?.annotations != nil {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.xib

@@ -3,6 +3,7 @@
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -355,6 +356,7 @@
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <color key="contentTintColor" name="KMColor_Layout_M"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="14" id="BfP-0t-bwZ"/>
                         <constraint firstAttribute="height" constant="14" id="ujc-2v-pXa"/>
@@ -787,5 +789,8 @@
         <image name="KMImageNameUXIconBtnCloseNor" width="16" height="16"/>
         <image name="KMImageNameUXIconPropertybarRotateClockwiseNor" width="20" height="20"/>
         <image name="KMImageNameUXIconPropertybarRotateCounterclockwiseNor" width="20" height="20"/>
+        <namedColor name="KMColor_Layout_M">
+            <color red="0.4392156862745098" green="0.39215686274509803" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>

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

@@ -253,15 +253,15 @@ import Cocoa
     override func viewDidAppear() {
         super.viewDidAppear()
         
-        //春季活动
-        if ((KMAdvertisementManager.manager.info.popWindowContent) != nil) {
-            if KMAdvertisementManager.manager.info.popWindowContent!.content!.count > 0 {
-                let info = KMAdvertisementManager.manager.info.popWindowContent!.content?.first
-                if KMAdvertisementManager.checkAdvertisementValid(info!) {
-                    self.loadRecommondPopWindow()
-                }
-            }
-        }
+//        //春季活动
+//        if ((KMAdvertisementManager.manager.info.popWindowContent) != nil) {
+//            if KMAdvertisementManager.manager.info.popWindowContent!.content!.count > 0 {
+//                let info = KMAdvertisementManager.manager.info.popWindowContent!.content?.first
+//                if KMAdvertisementManager.checkAdvertisementValid(info!) {
+//                    self.loadRecommondPopWindow()
+//                }
+//            }
+//        }
         
         //刷新前一页后一页按钮
         self.updateNextAndPreViousButtonState()

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -403,17 +403,17 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
         self.freeVersionInfoLbl6.textColor =
         self.freeVersionInfoLbl7.textColor =
         self.freeVersionInfoLbl8.textColor =
+        self.aiInfoLbl1.textColor = self.aiInfoLbl2.textColor = self.aiInfoLbl3.textColor = self.aiInfoLbl4.textColor = [NSColor colorWithRed:20/255. green:0 blue:102/255. alpha:1];
         
-        self.parmanentVerInfoLbl1.textColor = 
+        self.parmanentVerInfoLbl1.textColor =
         self.parmanentVerInfoLbl2.textColor =
         self.parmanentVerInfoLbl3.textColor =
         self.parmanentVerInfoLbl4.textColor =
         self.parmanentVerInfoLbl5.textColor =
         self.parmanentVerInfoLbl6.textColor =
         self.parmanentVerInfoLbl7.textColor =
-        self.parmanentVerInfoLbl8.textColor = 
+        self.parmanentVerInfoLbl8.textColor = [NSColor whiteColor];
         
-        self.aiInfoLbl1.textColor = self.aiInfoLbl2.textColor = self.aiInfoLbl3.textColor = self.aiInfoLbl4.textColor = [NSColor colorWithRed:20/255. green:0 blue:102/255. alpha:1];
         self.aiPurchaseLabel.textColor = [NSColor whiteColor];
         self.aiTitleLabel.textColor = [NSColor colorWithRed:20/255. green:0 blue:102/255. alpha:1];
     }

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.xib

@@ -59,7 +59,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="160" y="33" width="932" height="610"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="932" height="610"/>
             <value key="maxSize" type="size" width="932" height="1110"/>
             <view key="contentView" wantsLayer="YES" id="se5-gp-TjO">

PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m

@@ -1070,36 +1070,36 @@ static VerificationManager *__verificationManager = nil;
 
 - (ActivityStatus)status {
     ActivityStatus tStatus = ActivityStatusTrialExpire;
-//    if ([[self[@"subscription"][@"status"] lowercaseString] isEqualToString:@"expired"]) {
-//        tStatus  = ActivityStatusLicenseExpire;
-//    }else{
-//        if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"activated"]) {
+    if ([[self[@"subscription"][@"status"] lowercaseString] isEqualToString:@"expired"]) {
+        tStatus  = ActivityStatusLicenseExpire;
+    }else{
+        if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"activated"]) {
             tStatus = ActivityStatusVerification;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"on_trial"]) {
-//            tStatus = ActivityStatusTrial;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_trial"]) {
-//            tStatus = ActivityStatusTrialExpire;
-//        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_license"]) {
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//    }
-//
-//    if (ActivityStatusTrial == tStatus) {
-//        if (self.expireDate &&
-//            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
-//            tStatus = ActivityStatusTrialExpire;
-//        }
-//    }else if (ActivityStatusVerification == tStatus) {
-//        if (self.expireDate &&
-//            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//        if (self[@"dejvice"][@"status"] &&
-//            [self[@"device"][@"status"] isEqualToString:@"expired_license"]) {
-//            //激活码过期
-//            tStatus = ActivityStatusVerifExpire;
-//        }
-//    }
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"on_trial"]) {
+            tStatus = ActivityStatusTrial;
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_trial"]) {
+            tStatus = ActivityStatusTrialExpire;
+        }else if ([[self[@"device"][@"status"] lowercaseString] isEqualToString:@"expired_license"]) {
+            tStatus = ActivityStatusVerifExpire;
+        }
+    }
+
+    if (ActivityStatusTrial == tStatus) {
+        if (self.expireDate &&
+            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
+            tStatus = ActivityStatusTrialExpire;
+        }
+    }else if (ActivityStatusVerification == tStatus) {
+        if (self.expireDate &&
+            [NSDate date].timeIntervalSince1970 - [self expireDate].timeIntervalSince1970 > 0) {
+            tStatus = ActivityStatusVerifExpire;
+        }
+        if (self[@"dejvice"][@"status"] &&
+            [self[@"device"][@"status"] isEqualToString:@"expired_license"]) {
+            //激活码过期
+            tStatus = ActivityStatusVerifExpire;
+        }
+    }
     return tStatus;
 }
 

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

@@ -556,22 +556,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "6BA5FC10-A784-4174-92DE-69500C4C09D6"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationButtonWidgetAppearanceViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "49"
-            endingLineNumber = "49"
-            landmarkName = "loadView()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -860,22 +844,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E7712F1A-E7C2-45F8-9E90-AA0F21D8B2A7"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController+Note.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "269"
-            endingLineNumber = "269"
-            landmarkName = "_addDeleteAllAnnoItem(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent