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

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarViewPretationNor.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic.pdf",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic 1.pdf",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarViewPretationNor.imageset/ic 1.pdf

@@ -0,0 +1,76 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.000000 5.000000 cm
+0.460000 0.465714 0.500000 scn
+20.000000 14.000000 m
+0.000000 14.000000 l
+0.000000 0.000000 l
+20.000000 0.000000 l
+20.000000 14.000000 l
+h
+8.750000 4.401924 m
+12.500000 7.000000 l
+8.750000 9.598076 l
+8.750000 4.401924 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  317
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000407 00000 n
+0000000429 00000 n
+0000000602 00000 n
+0000000676 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+735
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarViewPretationNor.imageset/ic.pdf

@@ -0,0 +1,76 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.000000 5.000000 cm
+0.460000 0.465714 0.500000 scn
+20.000000 14.000000 m
+0.000000 14.000000 l
+0.000000 0.000000 l
+20.000000 0.000000 l
+20.000000 14.000000 l
+h
+8.750000 4.401924 m
+12.500000 7.000000 l
+8.750000 9.598076 l
+8.750000 4.401924 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  317
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000407 00000 n
+0000000429 00000 n
+0000000602 00000 n
+0000000676 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+735
+%%EOF

PDF Office/PDF Master/Class/PDFWindowController/MainWindowController/KMPresentationTopViewController.swift

@@ -51,6 +51,8 @@ public class KMPresentationTopViewController: NSViewController, KMDrawViewDelega
     public override func viewDidLoad() {
         super.viewDidLoad()
         
+        self.view.appearance = NSAppearance(named: .aqua)
+
         pageNubLabel.stringValue =  "\((pdfView?.currentPageIndex ?? 0) + 1)/\(pdfView?.document.pageCount ?? 0)"
         
         NotificationCenter.default.addObserver(self, selector: #selector(pageChangedNotification(_:)), name: NSNotification.Name.CPDFViewPageChanged, object: self.pdfView)
@@ -107,9 +109,6 @@ public class KMPresentationTopViewController: NSViewController, KMDrawViewDelega
         updatePageState()
         if(pdfView?.canGoToNextPage() == true) {
             pdfView?.goToNextPage(sender)
-            let presentationDrawView = pdfView?.presentationDrawView
-
-            presentationDrawView?.clear()
         }
     }
     
@@ -117,9 +116,6 @@ public class KMPresentationTopViewController: NSViewController, KMDrawViewDelega
         updatePageState()
         if(pdfView?.canGoToPreviousPage() == true) {
             pdfView?.goToPreviousPage(sender)
-            let presentationDrawView = pdfView?.presentationDrawView
-
-            presentationDrawView?.clear()
         }
     }
     
@@ -144,6 +140,8 @@ public class KMPresentationTopViewController: NSViewController, KMDrawViewDelega
             isSelectionPre = true
 
         }
+        undoButton.isEnabled = false
+
         textColorPickerView.decSelectionColorView()
         delegate?.presentationTopViewType?(self, withButton: sender, isSeletion: isSelectionPre)
     }
@@ -162,6 +160,9 @@ public class KMPresentationTopViewController: NSViewController, KMDrawViewDelega
         if pdfview.document == self.pdfView?.document {
             pageNubLabel.stringValue =  "\((pdfView?.currentPageIndex ?? 0) + 1)/\(pdfView?.document.pageCount ?? 0)"
             updatePageState()
+            let presentationDrawView = pdfView?.presentationDrawView
+            presentationDrawView?.resetUndoManager()
+            presentationDrawView?.clear()
         }
     }
     

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m

@@ -238,7 +238,7 @@ NSNotificationName const CPDFListViewDisplayModeChangeNotification = @"CPDFListV
 
 - (KMDrawView *)presentationDrawView {
     if(!_presentationDrawView) {
-        float scale = 1.4;
+        float scale = 6;//放大比例，越大可能会卡顿
         _presentationDrawView = [[KMDrawView alloc] initWithFrame:CGRectMake(0, 0,
                                                                      scale * self.bounds.size.width,
                                                                      scale * self.bounds.size.height)];

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -304,9 +304,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
             return;
         }
     }
-    
-    
-    
+        
     if (self.isEditing) {
 //        [super mouseMoved:event];
         return;
@@ -1237,6 +1235,13 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
 }
 
 - (NSArray<NSMenuItem *> *)menuItemsEditingAtPoint:(CGPoint)point forPage:(CPDFPage *)page {
+    if(self.isPresentationMode) {
+        return nil;
+    } else {
+        if(self.presentationDrawView.isHidden == NO) {
+            return nil;
+        }
+    }
     NSMutableArray <NSMenuItem *>*menuItems = [super menuItemsEditingAtPoint:point forPage:page].mutableCopy;
     if (!menuItems) {
         menuItems  = [NSMutableArray array];

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/PageDisplay/KMPageDisplayPropertiesViewController.swift

@@ -61,6 +61,8 @@ class KMPageDisplayPropertiesButton: NSButton {
     @IBOutlet private var twoPagesButton: KMPageDisplayPropertiesButton!
     @IBOutlet private var coverPageButton: KMPageDisplayPropertiesButton!
     @IBOutlet private var readModeButton: KMPageDisplayPropertiesButton!
+    @IBOutlet private var pretationButton: KMPageDisplayPropertiesButton!
+
     @IBOutlet private var continuousScrollButton: NSButton!
     @IBOutlet private var pageBreaksButton: NSButton!
     @IBOutlet private var pageDisplayHeightConstraint: NSLayoutConstraint!
@@ -137,6 +139,12 @@ class KMPageDisplayPropertiesButton: NSButton {
         readModeButton.toolTip = NSLocalizedString("Read Mode", comment: "Menu item title")
         readModeButton.image = NSImage(named: KMImageNameUXIconPropertybarViewPagereadingNor)
         readModeButton.wantsLayer = true
+        
+        pretationButton.title = NSLocalizedString("Presentation", comment: "Menu item title")
+        pretationButton.toolTip = NSLocalizedString("Presentation", comment: "Menu item title")
+        pretationButton.image = NSImage(named: "KMImageNameUXIconPropertybarViewPretationNor")
+        pretationButton.wantsLayer = true
+
         continuousScrollButton.title = NSLocalizedString("Continuous Scroll", comment: "")
         pageBreaksButton.title = NSLocalizedString("Page Breaks", comment: "")
 
@@ -221,7 +229,7 @@ class KMPageDisplayPropertiesButton: NSButton {
         themeLabel.stringValue = NSLocalizedString("Themes", comment: "")
         themeLabel.textColor = KMAppearance.Layout.h0Color()
 
-        let buttonArr: [NSButton] = [singlePageButton, twoPagesButton, coverPageButton, readModeButton, continuousScrollButton, singleScreenButton, verticalScreenButton, horizontalScreenButton]
+        let buttonArr: [NSButton] = [singlePageButton, twoPagesButton, coverPageButton, readModeButton,pretationButton, continuousScrollButton, singleScreenButton, verticalScreenButton, horizontalScreenButton]
 
         for button in buttonArr {
             if let attrTitle = button.attributedTitle.mutableCopy() as? NSMutableAttributedString {
@@ -487,6 +495,8 @@ class KMPageDisplayPropertiesButton: NSButton {
 //            readerModeBlock?(isReaderMode)
             FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting_ReadMode"])
             self.mainController?.selectDisplay(display: isContinuPage ? .readContinuous : .readModel, viewSettingIsReload: false)
+        case 4:
+            self.mainController?.togglePresentation(nil)
         default:
             break
         }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/PageDisplay/KMPageDisplayPropertiesViewController.xib

@@ -20,6 +20,7 @@
                 <outlet property="pageBreaksButton" destination="u43-eA-4ai" id="gtA-fd-TuN"/>
                 <outlet property="pageDisplayHeightConstraint" destination="tBY-Hr-JGP" id="eGO-lK-1cl"/>
                 <outlet property="pageLayoutLabel" destination="Efp-X6-DcQ" id="0HG-it-Re4"/>
+                <outlet property="pretationButton" destination="YHx-dH-KJO" id="2gC-4Z-Sky"/>
                 <outlet property="readModeButton" destination="Nz2-JE-kfR" id="w23-C8-j54"/>
                 <outlet property="replaceFileButton" destination="7FZ-Ad-fZx" id="Tfd-Gy-htS"/>
                 <outlet property="replaceFileNameLabel" destination="4TV-Mh-JcQ" id="REP-fk-lco"/>
@@ -43,17 +44,17 @@
             <rect key="frame" x="0.0" y="0.0" width="481" height="812"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="atO-N3-K8L" customClass="KMClipView">
-                <rect key="frame" x="0.0" y="0.0" width="481" height="812"/>
+                <rect key="frame" x="0.0" y="0.0" width="466" height="812"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <view translatesAutoresizingMaskIntoConstraints="NO" id="vbu-i7-n0A">
-                        <rect key="frame" x="0.0" y="82" width="481" height="730"/>
+                        <rect key="frame" x="0.0" y="-8" width="466" height="820"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="ao9-iB-qLE">
-                                <rect key="frame" x="16" y="10" width="449" height="270"/>
+                                <rect key="frame" x="16" y="10" width="434" height="270"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gm1-5b-ejX">
-                                        <rect key="frame" x="-2" y="240" width="453" height="20"/>
+                                        <rect key="frame" x="-2" y="240" width="438" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="JVj-Iy-7eF"/>
                                         </constraints>
@@ -64,13 +65,13 @@
                                         </textFieldCell>
                                     </textField>
                                     <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xHh-7X-WA2">
-                                        <rect key="frame" x="0.0" y="10" width="449" height="220"/>
+                                        <rect key="frame" x="0.0" y="10" width="434" height="220"/>
                                         <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="MZz-gQ-q3e">
-                                            <rect key="frame" x="0.0" y="0.0" width="449" height="220"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="434" height="220"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <collectionView selectable="YES" id="0Pp-z7-VAk">
-                                                    <rect key="frame" x="0.0" y="0.0" width="449" height="220"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="434" height="220"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                                     <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="tD9-si-e4y">
                                                         <size key="itemSize" width="58" height="64"/>
@@ -104,10 +105,10 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="mOq-N3-z4J">
-                                <rect key="frame" x="16" y="379" width="449" height="148"/>
+                                <rect key="frame" x="16" y="379" width="434" height="148"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SCr-Pi-j5S">
-                                        <rect key="frame" x="-2" y="118" width="453" height="20"/>
+                                        <rect key="frame" x="-2" y="118" width="438" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="roF-o7-wZm"/>
                                         </constraints>
@@ -132,20 +133,20 @@
                                         </connections>
                                     </button>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="GuL-TU-LEs">
-                                        <rect key="frame" x="316" y="52" width="83" height="56"/>
+                                        <rect key="frame" x="306" y="52" width="78" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="4Bn-pv-cGt"/>
                                         </constraints>
                                     </customView>
                                     <button verticalHuggingPriority="750" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DdU-4D-Jdj">
-                                        <rect key="frame" x="399" y="52" width="50" height="56"/>
+                                        <rect key="frame" x="384" y="52" width="50" height="56"/>
                                         <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="TRA-4E-Pe2">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="smallSystem"/>
                                         </buttonCell>
                                     </button>
                                     <button verticalHuggingPriority="750" tag="2" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="w7h-TO-8Yp" customClass="KMPageDisplayPropertiesButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="266" y="52" width="50" height="56"/>
+                                        <rect key="frame" x="256" y="52" width="50" height="56"/>
                                         <buttonCell key="cell" type="square" title="Title" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarViewSplitscreenhorNor" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="NTU-XQ-DJt">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="smallSystem"/>
@@ -155,13 +156,13 @@
                                         </connections>
                                     </button>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="AKa-Z2-6qC">
-                                        <rect key="frame" x="50" y="52" width="83" height="56"/>
+                                        <rect key="frame" x="50" y="52" width="78" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="L9k-ZA-6Sw"/>
                                         </constraints>
                                     </customView>
                                     <button verticalHuggingPriority="750" tag="1" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A1N-XA-yOH" customClass="KMPageDisplayPropertiesButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="133" y="52" width="50" height="56"/>
+                                        <rect key="frame" x="128" y="52" width="50" height="56"/>
                                         <buttonCell key="cell" type="square" title="Title" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarViewSplitscreenverNor" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="Glv-3q-e1k">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="smallSystem"/>
@@ -171,16 +172,16 @@
                                         </connections>
                                     </button>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="VBx-qZ-vcN">
-                                        <rect key="frame" x="183" y="52" width="83" height="56"/>
+                                        <rect key="frame" x="178" y="52" width="78" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="DPL-iE-QYN"/>
                                         </constraints>
                                     </customView>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="IC2-WP-iLV">
-                                        <rect key="frame" x="0.0" y="0.0" width="449" height="42"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="434" height="42"/>
                                         <subviews>
                                             <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Nsl-b5-RfC">
-                                                <rect key="frame" x="0.0" y="39" width="449" height="5"/>
+                                                <rect key="frame" x="0.0" y="39" width="434" height="5"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="1" id="XaF-dS-th1"/>
                                                 </constraints>
@@ -194,7 +195,7 @@
                                                 </textFieldCell>
                                             </textField>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7FZ-Ad-fZx">
-                                                <rect key="frame" x="404" y="10" width="45" height="20"/>
+                                                <rect key="frame" x="389" y="10" width="45" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="1Ye-jP-kPQ"/>
                                                     <constraint firstAttribute="width" priority="500" id="D0V-2p-e6Q"/>
@@ -256,10 +257,10 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="vLs-DH-OYK">
-                                <rect key="frame" x="16" y="547" width="449" height="173"/>
+                                <rect key="frame" x="16" y="547" width="434" height="263"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Efp-X6-DcQ">
-                                        <rect key="frame" x="-2" y="143" width="453" height="20"/>
+                                        <rect key="frame" x="-2" y="233" width="438" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="ktK-MN-6Wm"/>
                                         </constraints>
@@ -270,9 +271,9 @@
                                         </textFieldCell>
                                     </textField>
                                     <button verticalHuggingPriority="750" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9oz-7L-80L" customClass="KMPageDisplayPropertiesButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="77" width="50" height="56"/>
+                                        <rect key="frame" x="0.0" y="167" width="68" height="56"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="50" id="4tq-tK-Iwa"/>
+                                            <constraint firstAttribute="width" constant="68" id="4tq-tK-Iwa"/>
                                             <constraint firstAttribute="height" constant="56" id="tBY-Hr-JGP"/>
                                         </constraints>
                                         <buttonCell key="cell" type="square" title="Title" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarViewPagesingleNor" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="TVe-q8-kd4">
@@ -284,7 +285,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" tag="1" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5ex-Cg-9BL" customClass="KMPageDisplayPropertiesButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="133" y="77" width="50" height="56"/>
+                                        <rect key="frame" x="183" y="167" width="68" height="56"/>
                                         <buttonCell key="cell" type="square" title="Title" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarViewPagedoubleNor" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="QOU-JK-ugq">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="smallSystem"/>
@@ -294,7 +295,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" tag="2" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Wg-kN-fA5" customClass="KMPageDisplayPropertiesButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="266" y="77" width="50" height="56"/>
+                                        <rect key="frame" x="366" y="167" width="68" height="56"/>
                                         <buttonCell key="cell" type="square" title="Title" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarViewPagecoverNor" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="2kr-Hd-OgG">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="smallSystem"/>
@@ -303,36 +304,20 @@
                                             <action selector="displayModeButtonAction:" target="-2" id="5Sj-Er-bJK"/>
                                         </connections>
                                     </button>
-                                    <button verticalHuggingPriority="750" tag="3" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Nz2-JE-kfR" customClass="KMPageDisplayPropertiesButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="399" y="77" width="50" height="56"/>
-                                        <buttonCell key="cell" type="square" title="Title" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarViewPagereadingNor" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="CXv-oK-Kdz">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="smallSystem"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="displayModeButtonAction:" target="-2" id="BaO-us-Sbx"/>
-                                        </connections>
-                                    </button>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="QpT-kf-e68">
-                                        <rect key="frame" x="50" y="77" width="83" height="56"/>
+                                        <rect key="frame" x="68" y="167" width="115" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="Wv2-fg-iGd"/>
                                         </constraints>
                                     </customView>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="amY-07-olk">
-                                        <rect key="frame" x="183" y="77" width="83" height="56"/>
+                                        <rect key="frame" x="251" y="167" width="115" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="kU4-nL-4ZQ"/>
                                         </constraints>
                                     </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="faP-1g-Xdz">
-                                        <rect key="frame" x="316" y="77" width="83" height="56"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="56" id="CtK-Ig-eEn"/>
-                                        </constraints>
-                                    </customView>
                                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Qco-Dk-82q">
-                                        <rect key="frame" x="0.0" y="58" width="449" height="5"/>
+                                        <rect key="frame" x="0.0" y="58" width="434" height="5"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="npP-Wd-L62"/>
                                         </constraints>
@@ -357,36 +342,56 @@
                                             <action selector="pageBreaksButtonAction:" target="-2" id="Adp-Bw-ChD"/>
                                         </connections>
                                     </button>
+                                    <button verticalHuggingPriority="750" tag="3" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Nz2-JE-kfR" customClass="KMPageDisplayPropertiesButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="99" width="68" height="56"/>
+                                        <buttonCell key="cell" type="square" title="Title" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarViewPagereadingNor" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="CXv-oK-Kdz">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="smallSystem"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="displayModeButtonAction:" target="-2" id="BaO-us-Sbx"/>
+                                        </connections>
+                                    </button>
+                                    <button verticalHuggingPriority="750" tag="4" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YHx-dH-KJO" customClass="KMPageDisplayPropertiesButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                                        <rect key="frame" x="183" y="108" width="68" height="38"/>
+                                        <buttonCell key="cell" type="square" title="Title" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarViewPretationNor" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="x57-Dd-5rN">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="smallSystem"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="displayModeButtonAction:" target="-2" id="5Nz-dq-i5m"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="9oz-7L-80L" firstAttribute="top" secondItem="Efp-X6-DcQ" secondAttribute="bottom" constant="10" id="0XV-Pj-M6o"/>
-                                    <constraint firstItem="faP-1g-Xdz" firstAttribute="leading" secondItem="7Wg-kN-fA5" secondAttribute="trailing" id="1iN-I0-kBG"/>
                                     <constraint firstItem="GgO-4o-sDQ" firstAttribute="leading" secondItem="vLs-DH-OYK" secondAttribute="leading" id="59Q-gu-3Z3"/>
                                     <constraint firstAttribute="trailing" secondItem="Qco-Dk-82q" secondAttribute="trailing" id="5yr-mf-iau"/>
                                     <constraint firstItem="5ex-Cg-9BL" firstAttribute="width" secondItem="9oz-7L-80L" secondAttribute="width" id="8is-ng-7uE"/>
+                                    <constraint firstAttribute="trailing" secondItem="7Wg-kN-fA5" secondAttribute="trailing" id="90w-Gw-DiE"/>
                                     <constraint firstItem="QpT-kf-e68" firstAttribute="leading" secondItem="9oz-7L-80L" secondAttribute="trailing" id="9MV-dF-y3G"/>
                                     <constraint firstItem="5ex-Cg-9BL" firstAttribute="leading" secondItem="QpT-kf-e68" secondAttribute="trailing" id="AYq-5Y-c77"/>
                                     <constraint firstItem="amY-07-olk" firstAttribute="centerY" secondItem="9oz-7L-80L" secondAttribute="centerY" id="Ag4-at-BWo"/>
                                     <constraint firstItem="Efp-X6-DcQ" firstAttribute="leading" secondItem="vLs-DH-OYK" secondAttribute="leading" id="Cp9-Eb-m1s"/>
+                                    <constraint firstItem="Nz2-JE-kfR" firstAttribute="top" secondItem="9oz-7L-80L" secondAttribute="bottom" constant="12" id="D4K-0O-3Ih"/>
                                     <constraint firstItem="Nz2-JE-kfR" firstAttribute="width" secondItem="9oz-7L-80L" secondAttribute="width" id="GCn-ta-dYa"/>
                                     <constraint firstAttribute="bottom" secondItem="u43-eA-4ai" secondAttribute="bottom" id="I0J-e2-Q83"/>
-                                    <constraint firstItem="Nz2-JE-kfR" firstAttribute="centerY" secondItem="9oz-7L-80L" secondAttribute="centerY" id="Od0-du-eaU"/>
+                                    <constraint firstItem="YHx-dH-KJO" firstAttribute="trailing" secondItem="5ex-Cg-9BL" secondAttribute="trailing" id="UGq-Vk-GvZ"/>
                                     <constraint firstItem="Nz2-JE-kfR" firstAttribute="height" secondItem="9oz-7L-80L" secondAttribute="height" id="Xuo-EA-Uk7"/>
-                                    <constraint firstAttribute="trailing" secondItem="Nz2-JE-kfR" secondAttribute="trailing" id="ZLh-4k-17D"/>
                                     <constraint firstItem="amY-07-olk" firstAttribute="leading" secondItem="5ex-Cg-9BL" secondAttribute="trailing" id="ZOG-LG-4UL"/>
                                     <constraint firstItem="5ex-Cg-9BL" firstAttribute="centerY" secondItem="9oz-7L-80L" secondAttribute="centerY" id="ZTp-Rg-Cv2"/>
                                     <constraint firstItem="GgO-4o-sDQ" firstAttribute="top" secondItem="Qco-Dk-82q" secondAttribute="bottom" constant="18" id="aAG-qc-kne"/>
-                                    <constraint firstItem="faP-1g-Xdz" firstAttribute="centerY" secondItem="9oz-7L-80L" secondAttribute="centerY" id="at6-yn-AWV"/>
-                                    <constraint firstItem="Qco-Dk-82q" firstAttribute="top" secondItem="9oz-7L-80L" secondAttribute="bottom" constant="16" id="avr-Xb-QTK"/>
-                                    <constraint firstItem="faP-1g-Xdz" firstAttribute="width" secondItem="QpT-kf-e68" secondAttribute="width" id="c8O-ej-Ppv"/>
+                                    <constraint firstItem="Qco-Dk-82q" firstAttribute="top" secondItem="9oz-7L-80L" secondAttribute="bottom" constant="106" id="avr-Xb-QTK"/>
                                     <constraint firstItem="7Wg-kN-fA5" firstAttribute="height" secondItem="9oz-7L-80L" secondAttribute="height" id="eQ6-TM-rpl"/>
+                                    <constraint firstItem="Nz2-JE-kfR" firstAttribute="leading" secondItem="vLs-DH-OYK" secondAttribute="leading" id="g2z-Ep-6Kv"/>
                                     <constraint firstItem="7Wg-kN-fA5" firstAttribute="width" secondItem="9oz-7L-80L" secondAttribute="width" id="gNM-h6-G93"/>
-                                    <constraint firstItem="Nz2-JE-kfR" firstAttribute="leading" secondItem="faP-1g-Xdz" secondAttribute="trailing" id="gdX-6t-PxE"/>
+                                    <constraint firstItem="YHx-dH-KJO" firstAttribute="centerY" secondItem="Nz2-JE-kfR" secondAttribute="centerY" id="jfK-fd-jwD"/>
                                     <constraint firstItem="9oz-7L-80L" firstAttribute="leading" secondItem="vLs-DH-OYK" secondAttribute="leading" id="jna-IY-VnR"/>
                                     <constraint firstAttribute="trailing" secondItem="Efp-X6-DcQ" secondAttribute="trailing" id="las-46-utd"/>
                                     <constraint firstItem="7Wg-kN-fA5" firstAttribute="leading" secondItem="amY-07-olk" secondAttribute="trailing" id="nSx-XS-IFF"/>
                                     <constraint firstItem="7Wg-kN-fA5" firstAttribute="centerY" secondItem="9oz-7L-80L" secondAttribute="centerY" id="neI-An-Nmx"/>
                                     <constraint firstItem="QpT-kf-e68" firstAttribute="centerY" secondItem="9oz-7L-80L" secondAttribute="centerY" id="p2E-vK-WeO"/>
+                                    <constraint firstItem="YHx-dH-KJO" firstAttribute="leading" secondItem="5ex-Cg-9BL" secondAttribute="leading" id="pFB-oR-t4l"/>
                                     <constraint firstItem="Qco-Dk-82q" firstAttribute="leading" secondItem="vLs-DH-OYK" secondAttribute="leading" id="sSg-0F-Eaj"/>
                                     <constraint firstItem="Efp-X6-DcQ" firstAttribute="top" secondItem="vLs-DH-OYK" secondAttribute="top" constant="10" id="tCs-RN-Twe"/>
                                     <constraint firstItem="u43-eA-4ai" firstAttribute="top" secondItem="GgO-4o-sDQ" secondAttribute="bottom" constant="10" id="teT-wE-7Md"/>
@@ -396,10 +401,10 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="74p-qc-QIt">
-                                <rect key="frame" x="16" y="300" width="449" height="64"/>
+                                <rect key="frame" x="16" y="300" width="434" height="64"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nT5-NN-Xiu">
-                                        <rect key="frame" x="-2" y="34" width="453" height="20"/>
+                                        <rect key="frame" x="-2" y="34" width="438" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="YyK-xf-MLn"/>
                                         </constraints>
@@ -493,8 +498,8 @@
                 <rect key="frame" x="-100" y="-100" width="303" height="15"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
-            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="gGc-XW-0cz">
-                <rect key="frame" x="466" y="0.0" width="15" height="728"/>
+            <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="gGc-XW-0cz">
+                <rect key="frame" x="466" y="0.0" width="15" height="812"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
             <point key="canvasLocation" x="-203.5" y="256"/>
@@ -507,6 +512,7 @@
         <image name="KMImageNameUXIconPropertybarViewPagedoubleNor" width="24" height="24"/>
         <image name="KMImageNameUXIconPropertybarViewPagereadingNor" width="24" height="24"/>
         <image name="KMImageNameUXIconPropertybarViewPagesingleNor" width="24" height="24"/>
+        <image name="KMImageNameUXIconPropertybarViewPretationNor" width="24" height="24"/>
         <image name="KMImageNameUXIconPropertybarViewSplitscreenhorNor" width="24" height="24"/>
         <image name="KMImageNameUXIconPropertybarViewSplitscreensingleNor" width="24" height="24"/>
         <image name="KMImageNameUXIconPropertybarViewSplitscreenverNor" width="24" height="24"/>