Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/Batch/View/KMBatchTableCellView.swift

@@ -68,7 +68,7 @@ class KMBatchTableCellView: NSTableCellView,NSComboBoxDelegate{
         self.type = type
     }
     func configuUIForSize() {
-        var tf = NSTextField(frame: .zero)
+        let tf = NSTextField(frame: .zero)
         self.textField = tf
         self.textField?.isBordered = false
         self.textField?.drawsBackground = true

PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift

@@ -494,7 +494,7 @@ class KMBatchOperateLeftViewController: NSViewController,NSTableViewDelegate,NST
       
         if identifier.rawValue == "index" {
             let cellView = KMBatchTableCellView(type: .Size)
-            var inde = row + 1
+            _ = row + 1
             cellView.textField?.stringValue = String(format: "%d", row + 1);
             return cellView;
         } else if identifier.rawValue == "pageRange"{

PDF Office/PDF Master/Class/PDFTools/AddHeaderFooter/VC/KMBatchOperateAddHeaderFooterViewController.swift

@@ -74,7 +74,7 @@ class KMBatchOperateAddHeaderFooterViewController: KMBatchOperateBaseViewControl
         NotificationCenter.default.addObserver(self, selector: #selector(batchFilesCountNotification(notification:)), name: NSNotification.Name("KMBatchFilesCountNotification"), object: nil)
     }
     func localizedLanguage() {
-        self.addButton.title = KMLocalizedString("Add Template", nil)
+        self.addButton.title = KMLocalizedString("  Add Template", nil)
         self.actionButton.title = KMLocalizedString("Apply", nil)
         self.titleLabel.stringValue = KMLocalizedString("Apply", nil)
     }

PDF Office/PDF Master/Class/PDFTools/AddHeaderFooter/VC/KMBatchOperateAddHeaderFooterViewController.xib

@@ -76,7 +76,7 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="eJd-b3-7bH">
                     <rect key="frame" x="0.0" y="0.0" width="370" height="108"/>
                     <subviews>
-                        <button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PXy-j3-0y8">
+                        <button tag="1" imageHugsTitle="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PXy-j3-0y8">
                             <rect key="frame" x="16" y="60" width="338" height="32"/>
                             <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="KWy-VT-uxN">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

PDF Office/PDF Master/Class/PDFTools/Merge/OCPart/KMTableRowView.swift

@@ -75,7 +75,8 @@ class KMTableRowView: NSTableRowView {
     override func drawSelection(in dirtyRect: NSRect) {
         if selectionBackgroundColorBlock == nil {
             let selectionRect = NSRect(x: selectionInset.left, y: selectionInset.top, width: NSWidth(bounds) - selectionInset.left - selectionInset.right, height: NSHeight(bounds) - selectionInset.top - selectionInset.bottom)
-            NSColor.lightGray.setFill()
+//            NSColor.lightGray.setFill()
+            KMAppearance.Status.selColor().setFill()
             let selectionPath = NSBezierPath(roundedRect: selectionRect, xRadius: selectionRadius, yRadius: selectionRadius)
             selectionPath.fill()
             return

PDF Office/PDF Master/Class/PDFTools/Watermark/Controller/KMBatchOperateAddWatermarkViewController.swift

@@ -405,7 +405,7 @@ class KMBatchOperateAddWatermarkViewController: KMBatchOperateBaseViewController
 
 extension KMBatchOperateAddWatermarkViewController {
     private func _localizedlanguage() {
-        self.addButton.title = KMLocalizedString("Add Template", nil)
+        self.addButton.title = KMLocalizedString("  Add Template", nil)
         self.addButton.imageHugsTitle = true
         self.fileButton.title = KMLocalizedString("File", nil)
         self.actionButton.title = KMLocalizedString("Apply", nil)

PDF Office/PDF Master/Class/PDFTools/Watermark/Controller/KMBatchOperateAddWatermarkViewController.xib

@@ -177,7 +177,7 @@
                             </view>
                             <color key="fillColor" name="KMColor_Interactive_S0"/>
                         </box>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="86I-d1-hEC">
+                        <button imageHugsTitle="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="86I-d1-hEC">
                             <rect key="frame" x="16" y="60" width="335" height="32"/>
                             <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="KMImageNameUXIconBtnAddNor" imagePosition="left" alignment="center" imageScaling="proportionallyDown" inset="2" id="LQN-Ej-4hH">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>