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

PDF Office/PDF Master/AppDelegate.swift

@@ -421,7 +421,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
         tVersion?.applicationBundleID = Bundle.main.bundleIdentifier
 
         var tStr = "New Update Available"
-        tVersion?.updateAvailableTitle = tVersion?.localizedString(forKey: tStr, withDefault: tStr)
+        tVersion?.updateAvailableTitle = (tVersion?.localizedString(forKey: tStr, withDefault: tStr) ?? "") + "\n" 
         tVersion?.versionLabelFormat = ""
         tVersion?.groupNotesByVersion = true
         tVersion?.showOnFirstLaunch = false
@@ -439,7 +439,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
         tStr = (tVersion?.localizedString(forKey: tStr, withDefault: tStr))!
         tStr = String(format: tStr, appName)
 
-        tVersion?.inThisVersionTitle = "\n" + tStr
+        tVersion?.inThisVersionTitle = tStr
         
         tStr = "UPDATE NOW";
         tVersion!.downloadButtonLabel = tVersion?.localizedString(forKey: tStr, withDefault: tStr)

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

@@ -667,6 +667,21 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
                 self.mainViewController?.model.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()
 

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

@@ -2978,13 +2978,17 @@ import Cocoa
             currentMenu.insertItem(self.enterAnnotationStype(), at: 3)
             currentMenu.insertItem(NSMenuItem.separator(), at: 3)
             if listView.currentSelection.selectionType() == .image{
-//                currentMenu.insertItem(self.setCutStype(), at: 1)
-                currentMenu.insertItem(self.setDeleteStype(), at: 4)
-                currentMenu.insertItem(NSMenuItem.separator(), at: 6)
-                currentMenu.insertItem(self.setEditNoteStype(), at: 6)
-                currentMenu.insertItem(self.setRotateStype(), at: 6)
-                currentMenu.insertItem(self.setLinesStype(), at: 6)
-                currentMenu.insertItem(self.setColorsStype(), at: 6)
+//
+//                    currentMenu.insertItem(self.setCutStype(), at: 1)
+//                }
+                if listView.activeAnnotations.count > 0 {
+                    currentMenu.insertItem(self.setDeleteStype(), at: 3)
+                    currentMenu.insertItem(NSMenuItem.separator(), at: 6)
+                    currentMenu.insertItem(self.setEditNoteStype(), at: 6)
+                    currentMenu.insertItem(self.setRotateStype(), at: 6)
+                    currentMenu.insertItem(self.setLinesStype(), at: 6)
+                    currentMenu.insertItem(self.setColorsStype(), at: 6)
+                }
             }
             if listView.currentSelection.selectionType() == .text {
                 currentMenu.insertItem(NSMenuItem.separator(), at: currentMenu.items.count)