Ver código fonte

【fix】【导航栏】App Store免费版,登录付费会员,打开多份文档,导航栏会有很多的空白(应该可以扩展页签的显示)

tangchao 2 meses atrás
pai
commit
ccaf7076eb

+ 2 - 2
PDF Office/PDF Master/Class/Account/WinBack/Window/KMWinBackWindowController.swift

@@ -76,7 +76,7 @@ class KMWinBackWindowController: KMBaseWindowController {
         titleLabel.stringValue = NSLocalizedString("PDF Reader Pro", comment: "")
         titleLabel.font = .SFProTextRegularFont(20)
         
-        despView_.titleLabel.stringValue = NSLocalizedString("PDF Reader Pro Advanced/n - 6 Months Plan", comment: "")
+        despView_.titleLabel.stringValue = NSLocalizedString("PDF Reader Pro Advanced\n - 6 Months Plan", comment: "")
         despView_.tipLabel.stringValue = NSLocalizedString("Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. ", comment: "")
         despView_.iconIv.image = NSImage(named: "KMImageNameWinBackDespIcon")
         
@@ -263,7 +263,7 @@ class KMWinBackWindowController: KMBaseWindowController {
                 self.despBox.fillColor = .white
                 self.despView_.titleLabel.textColor = NSColor(hex: "#0E1114")
                 
-                let despAttri = NSMutableAttributedString(string: NSLocalizedString("First 6 months", comment: ""), attributes: [.font : NSFont.SFProTextRegularFont(14), .foregroundColor : NSColor(hex: "#000150")])
+                let despAttri = NSMutableAttributedString(string: NSLocalizedString("First 6 months", comment: "")+" ", attributes: [.font : NSFont.SFProTextRegularFont(14), .foregroundColor : NSColor(hex: "#000150")])
                 despAttri.append(.init(string: self.displayPriceString_, attributes: [.font : NSFont.SFProTextRegularFont(14), .foregroundColor : NSColor(hex: "#4982E6")]))
                 let string = ", " + String(format: NSLocalizedString("then %@ for 6 months.", comment: ""), self.origialPrice_)
                 despAttri.append(.init(string: string, attributes: [.font : NSFont.SFProTextRegularFont(14), .foregroundColor : NSColor(hex: "#000150")]))

+ 9 - 2
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -311,9 +311,9 @@ import Cocoa
                         return
                     }
                     var superRect = rsView.frame
-                    if (superRect.size.width < self!.rightMessageVC.view.frame.size.width + 8) {
+//                    if (superRect.size.width < self!.rightMessageVC.view.frame.size.width + 8) {
                         superRect.size.width = self!.rightMessageVC.view.frame.size.width + 8
-                    }
+//                    }
                     
                     if let supView = rsView.superview {
                         let viewRect = supView.frame
@@ -324,6 +324,13 @@ import Cocoa
                     }
                     
                     self?.rightToolbarItemView.frame = superRect
+                    
+                    if let data = self?.rightStripView.frame, CGRectIsEmpty(data) == false {
+                        var frame = data
+                        frame.size.width = superRect.size.width
+                        self?.rightStripView.frame = frame
+                        self?.layoutSubviews()
+                    }
                 }
                 var rect = self.rightMessageVC.view.frame;
                 rect.origin.x = NSWidth(self.rightToolbarItemView.frame) - rect.size.width - 8

+ 4 - 4
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -357,10 +357,6 @@ NSPopoverDelegate>
     self.label.hidden = NO;
     self.secondTrialBtn.hidden = YES;
     
-    if (self.frameUpdateHandle) {
-        self.frameUpdateHandle(self.view.frame);
-    }
-    
     CGFloat totalWidth = 8;
     self.button.hidden = NO;
     self.officeButton.hidden = NO;
@@ -853,6 +849,10 @@ NSPopoverDelegate>
     }
     
     self.view.frame = CGRectMake(MAX(0, CGRectGetWidth(self.view.superview.frame)-totalWidth - 8), (CGRectGetHeight(self.view.superview.frame)-CGRectGetHeight(self.view.frame))/2., totalWidth, self.view.frame.size.height);
+    
+    if (self.frameUpdateHandle) {
+        self.frameUpdateHandle(self.view.frame);
+    }
 }
 
 #pragma mark - Button Actions

+ 1 - 1
PDF Office/PDF Master/Strings/ar.lproj/Localizable.strings

@@ -4802,7 +4802,7 @@
 
 "PDF Reader Pro" = "قارئ PDF برو";
 "Special Offer - " = "عرض خاص - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "قارئ PDF المتقدم/n- خطة 6 أشهر";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "قارئ PDF المتقدم\n- خطة 6 أشهر";
 "First 6 months" = "أول 6 أشهر";
 "then %@ for 6 months." = "ثم %@ دولارًا لمدة 6 أشهر.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "نظرًا لأنك كنت مشتركًا سابقًا في PDF Reader Pro، فإننا نقدم لك الآن عرضًا خاصًا.";

+ 1 - 1
PDF Office/PDF Master/Strings/de.lproj/Localizable.strings

@@ -3167,7 +3167,7 @@
 
 "PDF Reader Pro" = "PDF Reader Pro";
 "Special Offer - " = "Sonderangebot - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "PDF Reader Pro Advanced/n- 6 Monats Plan";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "PDF Reader Pro Advanced\n- 6 Monats Plan";
 "First 6 months" = "Erste 6 Monate";
 "then %@ for 6 months." = "dann %@ für 6 Monate.        ";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Da Sie zuvor PDF Reader Pro abonniert hatten, unterbreiten wir Ihnen jetzt ein Sonderangebot.        ";

+ 1 - 1
PDF Office/PDF Master/Strings/en.lproj/Localizable.strings

@@ -4339,7 +4339,7 @@
 
 "PDF Reader Pro" = "PDF Reader Pro";
 "Special Offer - " = "Special Offer - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "PDF Reader Pro Advanced/n - 6 Months Plan";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "PDF Reader Pro Advanced\n - 6 Months Plan";
 "First 6 months" = "First 6 months";
 "then %@ for 6 months." = "then %@ for 6 months.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. ";

+ 1 - 1
PDF Office/PDF Master/Strings/es.lproj/Localizable.strings

@@ -3247,7 +3247,7 @@
 
 "PDF Reader Pro" = "Lector de PDF profesional";
 "Special Offer - " = "Oferta especial - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "Lector de PDF Pro Avanzado/n- Plan de 6 meses";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "Lector de PDF Pro Avanzado\n- Plan de 6 meses";
 "First 6 months" = "Primeros 6 meses";
 "then %@ for 6 months." = "luego %@ por 6 meses.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Debido a que anteriormente estaba suscrito a PDF Reader Pro, ahora le ofrecemos una oferta especial.";

+ 1 - 1
PDF Office/PDF Master/Strings/fr.lproj/Localizable.strings

@@ -3133,7 +3133,7 @@
 
 "PDF Reader Pro" = "Lecteur PDF Pro";
 "Special Offer - " = "Offre spéciale - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "Lecteur PDF Pro Avancé/n- Forfait 6 mois";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "Lecteur PDF Pro Avancé\n- Forfait 6 mois";
 "First 6 months" = "6 premiers mois";
 "then %@ for 6 months." = "puis %@ pour 6 mois.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Parce que vous étiez auparavant abonné à PDF Reader Pro, nous vous proposons désormais une offre spéciale.    ";

+ 1 - 1
PDF Office/PDF Master/Strings/it.lproj/Localizable.strings

@@ -3043,7 +3043,7 @@
 
 "PDF Reader Pro" = "Lettore PDF Pro";
 "Special Offer - " = "Offerta speciale - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "Lettore PDF Pro Avanzato/n- Piano di 6 mesi";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "Lettore PDF Pro Avanzato\n- Piano di 6 mesi";
 "First 6 months" = "Primi 6 mesi";
 "then %@ for 6 months." = "poi %@ per 6 mesi.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Poiché in precedenza eri abbonato a PDF Reader Pro, ora ti offriamo un'offerta speciale.";

+ 1 - 1
PDF Office/PDF Master/Strings/ja.lproj/Localizable.strings

@@ -3323,7 +3323,7 @@
 
 "PDF Reader Pro" = "PDF リーダー プロ";
 "Special Offer - " = "特別オファー - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "PDF Reader Pro プレミアム版/n- 6か月のサブスクリプション";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "PDF Reader Pro プレミアム版\n- 6か月のサブスクリプション";
 "First 6 months" = "最初の 6 か月間は";
 "then %@ for 6 months." = "その後 6 か月間 %@";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "以前に PDF Reader Pro を購読したことがある方に、特別オファーを提供いたします。";

+ 1 - 1
PDF Office/PDF Master/Strings/nl.lproj/Localizable.strings

@@ -3205,7 +3205,7 @@
 
 "PDF Reader Pro" = "PDF-lezer Pro";
 "Special Offer - " = "Speciale aanbieding - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "PDF Reader Pro Geavanceerd/n- 6 maandenplan";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "PDF Reader Pro Geavanceerd\n- 6 maandenplan";
 "First 6 months" = "Eerste 6 maanden";
 "then %@ for 6 months." = "daarna %@ voor 6 maanden.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Omdat u eerder geabonneerd was op PDF Reader Pro, doen wij u nu een speciale aanbieding.";

+ 1 - 1
PDF Office/PDF Master/Strings/pl.lproj/Localizable.strings

@@ -3259,7 +3259,7 @@
 
 "PDF Reader Pro" = "Czytnik PDF Pro";
 "Special Offer - " = "Oferta specjalna – ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "Czytnik PDF Pro Zaawansowany/n- Plan 6-miesięczny";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "Czytnik PDF Pro Zaawansowany\n- Plan 6-miesięczny";
 "First 6 months" = "Pierwsze 6 miesięcy";
 "then %@ for 6 months." = "następnie %@ przez 6 miesięcy.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Ponieważ wcześniej subskrybowałeś program PDF Reader Pro, oferujemy teraz specjalną ofertę.";

+ 1 - 1
PDF Office/PDF Master/Strings/pt.lproj/Localizable.strings

@@ -4722,7 +4722,7 @@
 
 "PDF Reader Pro" = "Leitor de PDF Pró";
 "Special Offer - " = "Oferta Especial - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "Leitor de PDF Pro Avançado/n- Plano de 6 Meses";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "Leitor de PDF Pro Avançado\n- Plano de 6 Meses";
 "First 6 months" = "Primeiros 6 meses";
 "then %@ for 6 months." = "depois %@ por 6 meses.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Como você já era assinante do PDF Reader Pro, agora estamos oferecendo uma oferta especial para você.";

+ 1 - 1
PDF Office/PDF Master/Strings/ru.lproj/Localizable.strings

@@ -3193,7 +3193,7 @@
 
 "PDF Reader Pro" = "PDF-ридер про";
 "Special Offer - " = "Скидка - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "PDF Reader Pro Продвинутый/n- План на 6 месяцев";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "PDF Reader Pro Продвинутый\n- План на 6 месяцев";
 "First 6 months" = "Первые 6 месяцев";
 "then %@ for 6 months." = "затем %@ 6 месяцев.";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "Поскольку ранее вы были подписаны на PDF Reader Pro, мы делаем для вас специальное предложение.";

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

@@ -4240,7 +4240,7 @@
 
 "PDF Reader Pro" = "PDF Reader Pro";
 "Special Offer - " = "特别优惠 - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "PDF Reader Pro 高级版/n- 6个月订阅";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "PDF Reader Pro 高级版\n- 6个月订阅";
 "First 6 months" = "前6个月为";
 "then %@ for 6 months." = "到期后为%@/6个月。";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "由于您之前订阅过PDF Reader Pro,因此我们现在向您提供特别优惠。";

+ 1 - 1
PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -4373,7 +4373,7 @@
 
 "PDF Reader Pro" = "PDF Reader Pro";
 "Special Offer - " = "特別優惠 - ";
-"PDF Reader Pro Advanced/n - 6 Months Plan" = "PDF Reader Pro 進階版/n- 6個月訂閱";
+"PDF Reader Pro Advanced\n - 6 Months Plan" = "PDF Reader Pro 進階版\n- 6個月訂閱";
 "First 6 months" = "前6個月為";
 "then %@ for 6 months." = "到期後為%@/6個月。";
 "Because you were previously subscribed to PDF Reader Pro, we are now delivering a special offer to you. " = "由於您之前訂閱過PDF Reader Pro,因此我們現在向您提供特別優惠。";