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

PDF Office/PDF Master/Class/Home/View/KMComboBox.swift

@@ -25,7 +25,8 @@ class KMComboBox: NSComboBox {
             p.x += comboxRect.width - 23
             p.y += (comboxRect.height - 16) / 2
             
-            NSColor.init(red: 245/255.0, green: 246/255.0, blue: 249/255.0, alpha: 1.0).setFill()
+//            NSColor.init(red: 255/255.0, green: 255/255.0, blue: 255/255.0, alpha: 1.0).setFill()
+            KMAppearance.Layout.l1Color().setFill()
             NSRect(x: p.x, y: 0, width: 16.0, height: comboxRect.height).fill()
 
             let image = NSImage(named: "KMImageNameUXIconBtnArrowDown")

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/Split/KMSecondaryViewController.m

@@ -89,7 +89,7 @@
     self.view.layer.backgroundColor = [KMAppearance KMColor_Layout_BG_Drak].CGColor;
         
     
-    [_dragOrClickButtonLabel setStringValue:NSLocalizedString(@"Drag file here to open it", nil)];
+    [_dragOrClickButtonLabel setStringValue:NSLocalizedString(@"Drag File Here Or Select File", nil)];
     _dragOrClickButtonLabel.textColor = [KMAppearance KMColor_Layout_H1];
     
     _selectFileButton.wantsLayer = YES;

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/Split/View/KMSecondaryPDFView.swift

@@ -614,7 +614,9 @@ class KMSecondaryPDFView: CPDFListView {
     }
     
     @objc func handlePageChangedNotification(_ notification: Notification) {
-        self.pagePopUpButton?.selectItem(at: self.currentPageIndex)
+        if !self.document.isLocked {
+            self.pagePopUpButton?.selectItem(at: self.currentPageIndex)
+        }
     }
     
     @objc func handleSynchronizedScaleChangedNotification(_ notification: Notification) {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift

@@ -143,8 +143,8 @@ class KMColorPickerView: NSControl {
             lastSubview.removeFromSuperview()
         }
 
-        var width: CGFloat = 30.0
-        let space: CGFloat = 9.0
+        let width: CGFloat = 30.0
+        let space: CGFloat = 7.0
         var posX: CGFloat = 0
         var buttons: [NSButton] = []
 

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/WindowController/KMAnnotationFontWindowController.swift

@@ -30,7 +30,11 @@ class KMFontModel: NSObject {
     
     static var sharedAnnotationFont: KMAnnotationFontWindowController!
     
-    var annotationFontModel: KMFontModel?
+    var annotationFontModel: KMFontModel? {
+        didSet {
+            reloadData()
+        }
+    }
     var callback: ((KMFontModel) -> Void)?
     @IBOutlet weak var fontLabel: NSTextField!
     @IBOutlet weak var fontComboBox: NSComboBox!
@@ -106,11 +110,15 @@ class KMFontModel: NSObject {
     // MARK: private Method
     
     func reloadData() {
+        
+        guard let fontSizePopUpButton = fontSizePopUpButton else { return }
         if fontWeightPopUpButton != nil {
             fontWeightPopUpButton.removeAllItems()
         }
-        fontSizePopUpButton.title = "\(annotationFontModel?.fontSize ?? 12) pt"
-
+        
+        
+        let index = fontSizePopUpButton.indexOfItem(withTitle: "\(Int(annotationFontModel?.fontSize ?? 12)) pt")
+        fontSizePopUpButton.selectItem(at: index)
         DispatchQueue.global(qos: .default).async {
             let fonts = NSFontManager.shared.availableFontFamilies
             var fontArr = [NSAttributedString]()

PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m

@@ -221,6 +221,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
 @property (nonatomic,assign) IBOutlet NSTextField *value3PurchaseLabel;
 @property (nonatomic,assign) IBOutlet NSTextField *value3PurchaseSubLabel;
 @property (nonatomic,assign) IBOutlet KMButton *value3PurchaseButton;
+@property (strong) IBOutlet NSTextField *value3PurchaseBtnLbl;
 
 @property (nonatomic,assign) IBOutlet NSButton *aboutButton;
 @property (nonatomic,assign) IBOutlet KMButton *btnRestore;
@@ -428,11 +429,14 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
     self.value2PurchaseLbl.textColor = [NSColor colorWithRed:85/255. green:40/255.0 blue:255.0/255.0 alpha:1.0];
     
     
-    self.value3PurchaseButton.title = NSLocalizedString(@"Purchase", nil);
+    self.value3PurchaseButton.title = NSLocalizedString(@"", nil);
+    self.value3PurchaseBtnLbl.stringValue = NSLocalizedString(@"Purchase", nil);
     self.value3PurchaseButton.wantsLayer = YES;
     [self.value3PurchaseButton setTitleColor:[NSColor colorWithRed:85/255. green:40/255.0 blue:255.0/255.0 alpha:1.0]];
+    self.value3PurchaseBtnLbl.textColor = [NSColor colorWithRed:85/255. green:40/255.0 blue:255.0/255.0 alpha:1.0];
     self.value3PurchaseButton.layer.backgroundColor = [NSColor whiteColor].CGColor;
     self.value3PurchaseButton.layer.cornerRadius = CGRectGetHeight(self.value3PurchaseButton.frame) / 2.;
+    
 
     self.titleLabel.stringValue = NSLocalizedString(@"Subscribe to All Access Pack to enjoy more expanded features.", nil);
     self.switchLabel.stringValue = NSLocalizedString(@"Choose your favorite payment and enjoy flexible upgrades.", nil);
@@ -515,10 +519,12 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
     };
     self.value3PurchaseButton.mouseMoveCallback = ^(BOOL mouseEntered) {
         if (mouseEntered) {
-            [blockSelf.value3PurchaseButton setTitleColor:[NSColor whiteColor]];
+//            [blockSelf.value3PurchaseButton setTitleColor:[NSColor whiteColor]];
+            blockSelf.value3PurchaseBtnLbl.textColor = [NSColor whiteColor];
             blockSelf.value3PurchaseButton.layer.backgroundColor = [NSColor colorWithRed:1 green:94/255.0 blue:44/255.0 alpha:1.0].CGColor;
         } else {
-            [blockSelf.value3PurchaseButton setTitleColor:[NSColor colorWithRed:85/255. green:40/255.0 blue:255.0/255.0 alpha:1.0]];
+//            [blockSelf.value3PurchaseButton setTitleColor:[NSColor colorWithRed:85/255. green:40/255.0 blue:255.0/255.0 alpha:1.0]];
+            blockSelf.value3PurchaseBtnLbl.textColor = [NSColor colorWithRed:85/255. green:40/255.0 blue:255.0/255.0 alpha:1.0];
             blockSelf.value3PurchaseButton.layer.backgroundColor = [NSColor whiteColor].CGColor;
         }
     };
@@ -686,7 +692,7 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
     
     self.value1PurchaseBtnLbl.font = [NSFont UbuntuBoldFontWithSize:16];
     self.value2PurchaseLbl.font = [NSFont UbuntuBoldFontWithSize:16];
-//    [self.value3PurchaseButton setTitleFont:[NSFont UbuntuBoldFontWithSize:16]];
+    self.value3PurchaseBtnLbl.font = [NSFont UbuntuBoldFontWithSize:16];
     
     self.value1PurchaseLabel.font = [NSFont UbuntuBoldFontWithSize:22];
     self.value2PurchaseLabel.font = [NSFont UbuntuBoldFontWithSize:22];

PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.xib

@@ -43,6 +43,7 @@
                 <outlet property="value2PurchaseSubLabel" destination="RdA-gL-hBx" id="bBZ-Fs-9pv"/>
                 <outlet property="value3InfoLabel" destination="x7t-cK-DUL" id="Mg1-Ck-4sj"/>
                 <outlet property="value3InfoView" destination="WOk-rB-efh" id="AZM-IN-4gQ"/>
+                <outlet property="value3PurchaseBtnLbl" destination="8rl-sK-MYi" id="AMl-U8-5Qx"/>
                 <outlet property="value3PurchaseButton" destination="uz9-wn-DIW" id="cJ8-Ni-LGD"/>
                 <outlet property="value3PurchaseLabel" destination="NoO-n7-bpV" id="b1n-dM-vPn"/>
                 <outlet property="value3PurchaseSubLabel" destination="wzo-Gq-dD2" id="CM0-xQ-XcI"/>
@@ -344,7 +345,7 @@
                                             <rect key="frame" x="12" y="16" width="120" height="40"/>
                                             <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" imagePosition="overlaps" alignment="center" imageScaling="axesIndependently" inset="2" id="yeW-KF-Zoh">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="systemBold" size="14"/>
+                                                <font key="font" metaFont="systemBold" size="16"/>
                                             </buttonCell>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="40" id="di2-w1-lny"/>
@@ -354,6 +355,14 @@
                                                 <action selector="buttonItemClicked_Upgrade:" target="-2" id="rTX-hB-r75"/>
                                             </connections>
                                         </button>
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8rl-sK-MYi">
+                                            <rect key="frame" x="57" y="30" width="31" height="17"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Buy" id="YvU-98-X2E">
+                                                <font key="font" metaFont="systemBold" size="14"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NoO-n7-bpV">
                                             <rect key="frame" x="-2" y="108" width="148" height="19"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="USD 79.99" id="hiM-ls-nyg">
@@ -369,8 +378,10 @@
                                         <constraint firstAttribute="trailing" secondItem="NoO-n7-bpV" secondAttribute="trailing" id="G8r-Ph-W1w"/>
                                         <constraint firstAttribute="trailing" secondItem="wzo-Gq-dD2" secondAttribute="trailing" id="Qjz-MH-w6q"/>
                                         <constraint firstItem="wzo-Gq-dD2" firstAttribute="top" secondItem="NoO-n7-bpV" secondAttribute="bottom" id="TOs-Lg-loX"/>
+                                        <constraint firstItem="uz9-wn-DIW" firstAttribute="centerX" secondItem="8rl-sK-MYi" secondAttribute="centerX" id="XD7-0L-FKr"/>
                                         <constraint firstAttribute="bottom" secondItem="uz9-wn-DIW" secondAttribute="bottom" constant="16" id="Zs2-Us-YrV"/>
                                         <constraint firstItem="uz9-wn-DIW" firstAttribute="centerX" secondItem="WOk-rB-efh" secondAttribute="centerX" id="bd0-G1-wKh"/>
+                                        <constraint firstItem="uz9-wn-DIW" firstAttribute="centerY" secondItem="8rl-sK-MYi" secondAttribute="centerY" constant="2" id="eT5-EC-uRF"/>
                                         <constraint firstAttribute="height" constant="164" id="heX-lX-eLW"/>
                                         <constraint firstItem="x7t-cK-DUL" firstAttribute="top" secondItem="WOk-rB-efh" secondAttribute="top" constant="16" id="hzQ-X3-oDl"/>
                                         <constraint firstItem="NoO-n7-bpV" firstAttribute="top" secondItem="x7t-cK-DUL" secondAttribute="bottom" constant="4" id="qvY-NL-YZ8"/>
@@ -385,7 +396,7 @@
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <textView editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="yjX-Ac-Ztb">
-                                                <rect key="frame" x="0.0" y="11" width="320" height="315"/>
+                                                <rect key="frame" x="0.0" y="12" width="320" height="314"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -457,7 +468,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                         </constraints>
                         <color key="fillColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                     </box>
-                    <scrollView misplaced="YES" borderType="none" horizontalLineScroll="49" horizontalPageScroll="10" verticalLineScroll="49" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0go-Ik-KIF">
+                    <scrollView misplaced="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="49" horizontalPageScroll="10" verticalLineScroll="49" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0go-Ik-KIF">
                         <rect key="frame" x="0.0" y="-30" width="970" height="518"/>
                         <clipView key="contentView" drawsBackground="NO" id="gjo-dO-ubC">
                             <rect key="frame" x="0.0" y="0.0" width="970" height="518"/>
@@ -750,7 +761,7 @@ https://www.pdfreaderpro.com/privacy-policy
</mutableString>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="7uf-W2-2qG">
-                            <rect key="frame" x="-100" y="-100" width="15" height="102"/>
+                            <rect key="frame" x="955" y="0.0" width="15" height="518"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>