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

PDF Office/PDF Master/Class/AD/KMAdsManager.swift

@@ -156,7 +156,7 @@ class KMAdsManager: NSObject {
             let formatter = DateFormatter()
             formatter.dateFormat = "yyyy-MM-dd"
             let str = formatter.string(from: dateToday)
-            let string = UserDefaults.standard.string(forKey: kLastLoadingDate) ?? str
+            let string = UserDefaults.standard.string(forKey: kLastLoadingDate) ?? "1990-01-01"
             let dateFormatter = DateFormatter()
             dateFormatter.dateFormat = "yyyy-MM-dd"
             guard let lastDate = dateFormatter.date(from: string) else {

PDF Office/PDF Master/Class/AD/KMAdsWebView.swift

@@ -100,7 +100,7 @@ class KMAdsWebView: NSView, WKNavigationDelegate, CAAnimationDelegate {
             #if VERSION_DMG
             data = ["http://test-pdf-pro.kdan.cn:3021/native?s=PDFReaderPro_Mac_DMG_HouseAD_728x90&testflag=on"]
             #else
-            data = ["http://test-pdf-pro.kdan.cn:3021/native?s=PDFReaderPro_Mac_Store_HouseAD_728x90&testflag=on"]
+            data = ["https://test.sitemaji.com/native/pdfreaderpro.html?s=PDFReaderPro_Mac_Store_728x90"]
             #endif
             #endif
             return data

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -117,6 +117,12 @@ import Cocoa
         }
     }
     
+    override func viewWillDisappear() {
+        super.viewWillDisappear()
+        
+        self.homeContentView.reloadData()
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do view setup here.
@@ -639,7 +645,6 @@ extension KMHomeViewController {
                     } else {
                         self.view.window?.windowController?.close()
                     }
-                    self.homeContentView.reloadData()
                 }
             }
         }

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

@@ -195,7 +195,7 @@ extension KMMainViewController {
     }
     
     func enterAnnotationStype() -> NSMenuItem {
-        let stypItem = NSMenuItem(title: NSLocalizedString("Annotation", comment: ""), action: nil, target: self)
+        let stypItem = NSMenuItem(title: NSLocalizedString("Annotate", comment: ""), action: nil, target: self)
         let stypeMenu = NSMenu()
         if listView.currentSelection != nil && listView.currentSelection.selectionType() == .text {
             _ = stypeMenu.addItem(withTitle: NSLocalizedString("Highlight", comment: ""), action: #selector(menuItemAnnotationClick_add), target: self, tag: 0)
@@ -204,7 +204,7 @@ extension KMMainViewController {
             stypeMenu.addItem(NSMenuItem.separator())
         }
         //        stypeMenu.addItem(withTitle: NSLocalizedString("Freehand", comment: ""), action: #selector(menuItemAnnotationClick_addStype), target: self, tag: 0)
-        _ = stypeMenu.addItem(withTitle: NSLocalizedString("Text Box", comment: ""), action: #selector(menuItemAnnotationClick_addStype), target: self, tag: 1)
+        _ = stypeMenu.addItem(withTitle: NSLocalizedString("Text Note", comment: ""), action: #selector(menuItemAnnotationClick_addStype), target: self, tag: 1)
         _ = stypeMenu.addItem(withTitle: NSLocalizedString("Anchored Note", comment: ""), action: #selector(menuItemAnnotationClick_addStype), target: self, tag: 2)
         //        stypeMenu.insertItem(NSMenuItem.separator(), at: 10000)
         stypeMenu.addItem(NSMenuItem.separator())
@@ -344,8 +344,8 @@ extension KMMainViewController {
         if dic.num == 100{
             newStr = str.prefix(dic.indexN) + "..."
         }
-        newStr = "Look Up " + newStr
-        let stypItem = NSMenuItem(title: NSLocalizedString(newStr, comment: ""), action: #selector(lookUpAction), target: self)
+        newStr = NSLocalizedString("Look Up ", comment: "") + "\"" + newStr + "\""
+        let stypItem = NSMenuItem(title: newStr, action: #selector(lookUpAction), target: self)
         
         return stypItem
     }
@@ -366,12 +366,12 @@ extension KMMainViewController {
         return stypItem
     }
     func setColorsStype() -> NSMenuItem {
-        let stypItem = NSMenuItem(title: NSLocalizedString("Colors...", comment: ""), action: #selector(ColorsItemAction), target: self)
+        let stypItem = NSMenuItem(title: NSLocalizedString("Colors", comment: ""), action: #selector(ColorsItemAction), target: self)
         
         return stypItem
     }
     func setLinesStype() -> NSMenuItem {
-        let stypItem = NSMenuItem(title: NSLocalizedString("Lines...", comment: ""), action: #selector(LinesItemAction), target: self)
+        let stypItem = NSMenuItem(title: NSLocalizedString("Lines", comment: ""), action: #selector(LinesItemAction), target: self)
         
         return stypItem
     }
@@ -419,9 +419,9 @@ extension KMMainViewController {
         if dic.num == 100{
             newStr = str.prefix(dic.indexN) + "..."
         }
-        newStr = "Translate " + newStr
+        newStr = NSLocalizedString("Translate", comment: "") + " \"" + newStr + "\""
 
-        let stypItem = NSMenuItem(title: NSLocalizedString(newStr, comment: ""), action: #selector(TranslateItemAction), target: self)
+        let stypItem = NSMenuItem(title: newStr, action: #selector(TranslateItemAction), target: self)
         
         return stypItem
     }

PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings

@@ -3637,3 +3637,5 @@
 "Front All Windows" = "将所有窗口移至最前";
 //help
 "Free PDF Template" = "免费PDF模板";
+"Look Up " = "查询 ";
+"Search with Baidu" = "用“Baidu”搜索";