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

PDF Office/PDF Master/AppDelegate.swift

@@ -317,6 +317,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
     
     @IBAction func closeDocument(_ sender: Any) {
         if ((NSApp.mainWindow?.windowController is KMBrowserWindowController) == false) {
+            guard let windowControler = NSApp.mainWindow?.windowController else {
+                return
+            }
+            windowControler.window?.performClose(nil)
             return
         }
         

PDF Office/PDF Master/Class/AIInfo/AIUserInfoController/AIUserInfoController.swift

@@ -91,16 +91,7 @@ import Cocoa
             self.view.frame = viewRect
         }
         
-        self.emptyShowAIBtn.isHidden = false
-        self.showAIRobotBtn.isHidden = false
-#if VERSION_DMG
-        self.emptyRestoreBtn.isHidden = false
-#else
-        self.emptyRestoreBtn.isHidden = true
-        self.emptyShowAIBtn.isHidden = true
-        self.showAIRobotBtn.isHidden = true
-        
-#endif
+        self.updateBtnShowState()
         
         self.updateEmptyCreditViewUI()
         self.updateCreditsViewUI()
@@ -260,16 +251,22 @@ import Cocoa
 
         self.creditsRestoreBtn.setTitleColor(KMAppearance.KMColor_Interactive_M0())
         
-#if VERSION_DMG
+        self.updateBtnShowState()
         
+    }
+    
+    func updateBtnShowState() {
+#if VERSION_DMG
+        self.emptyRestoreBtn.isHidden = false
 #else
+        self.emptyRestoreBtn.isHidden = true
+        self.creditsRestoreBtn.isHidden = true
         if AIInfoManager.default().aiInfoValid == true {
             self.creditsBuyNowBox.isHidden = true
         } else {
             self.creditsBuyNowBox.isHidden = false
         }
 #endif
-        
     }
     
     func updateCreditsViewInfo() -> Void {
@@ -292,11 +289,23 @@ import Cocoa
         self.dateInfoLabel.stringValue = startDateStr + " - " + endDateStr
         
         self.emptyContendBox.isHidden = true
+        self.emptyShowAIBtn.isHidden = true
         self.creditsContendBox.isHidden = true
         if AIInfoManager.default().aiInfoValid == true {
             self.creditsContendBox.isHidden = false
         } else {
             self.emptyContendBox.isHidden = false
+            self.emptyShowAIBtn.isHidden = false
+        }
+        
+        if AIInfoManager.default().aiInfoValid == true {
+            var viewRect = self.view.frame
+            viewRect.size.height = 330
+            self.view.frame = viewRect
+        } else {
+            var viewRect = self.view.frame
+            viewRect.size.height = 386
+            self.view.frame = viewRect
         }
     }