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

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -16,6 +16,9 @@ import Cocoa
     var currentTimer: Timer?
     private(set) var isMultiTabMode: Bool = false
     
+    var rightMessageVC: KMVerificationMessageViewController!
+    var rightToolbarItemView: NSView!
+    
     private var homeVC: KMHomeViewController?
 
     override func windowDidLoad() {
@@ -222,7 +225,26 @@ import Cocoa
     
     override var rightStripView: NSView! {
         get {
-            return rightTabStripView_
+            if self.rightToolbarItemView == nil {
+                self.rightToolbarItemView = NSView.init(frame: CGRectMake(0, 0, 184, 40))
+                self.rightToolbarItemView.wantsLayer = true
+                
+                if self.rightMessageVC == nil {
+                    self.rightMessageVC = KMVerificationMessageViewController.init()
+                }
+                self.rightMessageVC.frameUpdateHandle = { [weak self] rect in
+                    var superRect = self?.rightToolbarItemView?.frame;
+                    superRect?.size.width = (self?.rightMessageVC.view.frame.size.width)! + 8
+                    self?.rightToolbarItemView.frame = superRect!;
+                }
+                var rect = self.rightMessageVC.view.frame;
+                rect.origin.x = CGRectGetWidth(self.rightToolbarItemView.frame) - rect.size.width - 8
+                rect.origin.y = (CGRectGetHeight(self.rightToolbarItemView.frame) - rect.size.height)/2
+                self.rightMessageVC.view.frame = rect
+                self.rightMessageVC.view.autoresizingMask = [.minYMargin, .maxXMargin, .maxYMargin]
+                self.rightToolbarItemView.addSubview(self.rightMessageVC.view)
+            }
+            return self.rightToolbarItemView
         }
     }
     

PDF Office/PDF Master/Class/ChromiumTabs/src/Browser Window/CTBrowserWindowController.m

@@ -869,34 +869,16 @@ static CTBrowserWindowController* _currentMain = nil; // weak
     
     CTTabContents* document = [self.browser activeTabContents];
 
-    KMToolbarRightView *rightStripView = nil;
-    if (document.isHome) {
-        rightStripView = self.homeRightStripView;
-    } else {
-        rightStripView = self.rightStripView;
-    }
+    NSView *rightStripView = self.rightStripView;
 
     CGFloat rightWidth = NSWidth([rightStripView frame]);
     
-    if (![[KMLightMemberManager manager] isLogin] ||
-        ([KMLightMemberManager manager].purchaseState !=  KMPurchaseManagerStateSubscription&&
-         [KMLightMemberManager manager].purchaseState != KMPurchaseManagerStateTrial)) {
-//        rightWidth = NSWidth([rightStripView frame]);
-//        rightWidth = 56.0 + rightStripView.fetchAdvancedViewSize.width;
-//        rightWidth += rightStripView.fetchAdvancedViewSize.width;
-        // TODO: 待优化。目前是写默认数值，上面注释的方式，在拖拽标签到新窗口时有问题。
-        rightWidth = 56.0 + 89;
-        [rightStripView fetchAdvancedViewSize_update_rightSegmentControlConstraint];
-    } else {
-        rightWidth = 56.0;
-    }
     CGFloat tabStripHeight = NSHeight([tabStripView frame]);
     CGFloat tabStripWidth = width - rightWidth;
 
     maxY -= tabStripHeight;
     if (fullscreen) {
         [tabStripView setFrame:NSMakeRect(0, maxY, tabStripWidth, tabStripHeight)];
-
     } else {
         CGFloat offset = [[tabStripController_ class] defaultIndentForControls];
         tabStripWidth  -= offset;
@@ -905,11 +887,7 @@ static CTBrowserWindowController* _currentMain = nil; // weak
     
     [tabStripController_ setIndentForControls:0];
 
-//    [rightStripView setFrame:NSMakeRect(NSMaxX(tabStripView.frame), maxY, rightWidth, tabStripHeight)];
-    self.homeRightStripView.frame = NSMakeRect(NSMaxX(tabStripView.frame), maxY, rightWidth, tabStripHeight);
     self.rightStripView.frame = NSMakeRect(NSMaxX(tabStripView.frame), maxY, rightWidth, tabStripHeight);
-    [(KMToolbarRightView *)self.rightStripView updateView];
-    [(KMToolbarRightView *)self.homeRightStripView updateView];
 
     // Set indentation.
     [tabStripController_ layoutTabsWithoutAnimation];

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.h

@@ -9,6 +9,8 @@
 
 @interface KMVerificationMessageViewController : NSViewController
 
+@property (nonatomic, copy) void(^frameUpdateHandle)(CGRect rect);
+
 - (void)reloadData;
 
 @end

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -315,10 +315,13 @@ NSPopoverDelegate>
         CGFloat originalWidth = self.view.frame.size.width;
         CGFloat newWidth = CGRectGetMaxX(self.button.frame);
         CGFloat changeValue = originalWidth - newWidth;
-        self.view.frame = CGRectMake(MAX(0, CGRectGetWidth(self.view.superview.frame)-newWidth - 8), CGRectGetHeight(self.view.superview.frame)-CGRectGetHeight(self.view.frame)-5, newWidth, self.view.frame.size.height);
+        self.view.frame = CGRectMake(0, CGRectGetHeight(self.view.superview.frame)/2.-CGRectGetHeight(self.view.frame)/2., newWidth, self.view.frame.size.height);
     }else {
         self.view.frame = CGRectMake(0,0, CGRectGetMaxX(self.button.frame) ,self.view.frame.size.height);
     }
+    if (self.frameUpdateHandle) {
+        self.frameUpdateHandle(self.view.frame);
+    }
     
     CGRect rect = self.button.frame;
     self.bgImg.frame = rect;

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,7 +20,7 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
             <rect key="frame" x="0.0" y="0.0" width="184" height="20"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ke5-qF-WBV">
                     <rect key="frame" x="0.0" y="0.0" width="136" height="18"/>
@@ -30,7 +30,7 @@
                             <rect key="frame" x="33" y="2" width="69" height="14"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Trial expired" id="8XR-4Y-Pwr">
-                                <font key="font" metaFont="system" size="11"/>
+                                <font key="font" metaFont="smallSystem"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
@@ -40,7 +40,7 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <buttonCell key="cell" type="bevel" title="Free Trial" bezelStyle="rounded" imagePosition="overlaps" alignment="center" lineBreakMode="charWrapping" imageScaling="axesIndependently" inset="2" id="a5h-OU-upy">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system" size="11"/>
+                                <font key="font" metaFont="smallSystem"/>
                             </buttonCell>
                             <connections>
                                 <action selector="secondTrialAction:" target="-2" id="55x-Hm-H0y"/>
@@ -58,7 +58,7 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="bevel" title="アップグレード" bezelStyle="rounded" imagePosition="overlaps" alignment="center" lineBreakMode="charWrapping" imageScaling="axesIndependently" inset="2" id="TYG-t1-nb5">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system" size="11"/>
+                        <font key="font" metaFont="smallSystem"/>
                     </buttonCell>
                     <connections>
                         <action selector="buttonAction:" target="-2" id="xOv-Gv-Xrg"/>

PDF Office/PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h

@@ -84,3 +84,4 @@
 #import "KMPurchaseCompareWindowController.h"
 #import "KMPurchaseCompareDMGWindowController.h"
 #import "KMVerificationWindowController.h"
+#import "KMVerificationMessageViewController.h"

PDF Office/PDF Master/PDF_Reader_Pro Edition-Bridging-Header.h

@@ -80,3 +80,4 @@
 #import "KMPurchaseCompareWindowController.h"
 #import "KMPurchaseCompareDMGWindowController.h"
 #import "KMVerificationWindowController.h"
+#import "KMVerificationMessageViewController.h"

PDF Office/PDF Master/PDF_Reader_Pro-Bridging-Header.h

@@ -80,3 +80,4 @@
 #import "KMPurchaseCompareWindowController.h"
 #import "KMPurchaseCompareDMGWindowController.h"
 #import "KMVerificationWindowController.h"
+#import "KMVerificationMessageViewController.h"

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,4 +3,54 @@
    uuid = "E7C3B034-85F9-4E63-8599-7CB8F874E11A"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E7C6290F-2ACD-4C05-98F9-3EFEA4242BBF"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/src/Browser Window/CTBrowserWindowController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "333"
+            endingLineNumber = "333"
+            landmarkName = "-themePatternPhase"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "E7C6290F-2ACD-4C05-98F9-3EFEA4242BBF - 8cd50dda9b8cb452"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CTBrowserWindowController themePatternPhase]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/src/Browser%20Window/CTBrowserWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "333"
+                  endingLineNumber = "333"
+                  offsetFromSymbolStart = "692">
+               </Location>
+               <Location
+                  uuid = "E7C6290F-2ACD-4C05-98F9-3EFEA4242BBF - 8cd50dda9b8cb452"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CTBrowserWindowController themePatternPhase]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/src/Browser%20Window/CTBrowserWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "333"
+                  endingLineNumber = "333"
+                  offsetFromSymbolStart = "888">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>