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

PDF Office/PDF Master/Class/Document/KMMainDocument.swift

@@ -667,6 +667,21 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
                 self.mainViewController?.password = password as String?
             }
         }
+        
+        
+        //如果已存在，开个存在页签
+        var selectDocument: KMMainDocument? = self
+        if selectDocument != nil {
+            if selectDocument?.browser != nil {
+                let currentIndex = selectDocument?.browser.tabStripModel.index(of: selectDocument)
+                selectDocument?.browser.tabStripModel.selectTabContents(at: Int32(currentIndex!), userGesture: true)
+                if (selectDocument?.browser.window.isVisible)! as Bool {
+                    selectDocument?.browser.window.orderFront(nil)
+                } else if (selectDocument?.browser.window.isMiniaturized)! as Bool {
+                    selectDocument?.browser.window.orderFront(nil)
+                }
+            }
+        }
     }
     
     func tryToUnlockDocument(_ document: CPDFDocument) {

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/Save/View/KMCompareSaveView.swift

@@ -59,9 +59,9 @@ class KMCompareSaveView: KMBaseXibView {
     }
 
     override func updateUI() {
-        oldDocTypeBtn.contentTintColor = KMAppearance.Layout.h0Color()
-        nDocTypeBtn.contentTintColor = KMAppearance.Layout.h0Color()
-        mergeDocTypeBtn.contentTintColor = KMAppearance.Layout.h0Color()
+        oldDocTypeBtn.setTitleColor(KMAppearance.Layout.h0Color())
+        nDocTypeBtn.setTitleColor(KMAppearance.Layout.h0Color())
+        mergeDocTypeBtn.setTitleColor(KMAppearance.Layout.h0Color())
 
         fileLocationTipLbl.textColor = KMAppearance.Layout.h0Color()