【视图】阅读模式UI调整

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/KMReadModelView.swift

@@ -8,9 +8,9 @@
 import Cocoa
 
 enum KMReadModelViewScaleType: String, CaseIterable {
-    case fitWidth = "Fit Width"
-    case actualSize = "Actual Size"
-    case autoSize = "Auto Size"
+    case fitWidth = "Fit"
+    case actualSize = "Actual"
+    case autoSize = "Auto"
     case _10 = "10%"
     case _25 = "25%"
     case _50 = "50%"
@@ -58,6 +58,8 @@ protocol KMReadModelViewDelegate: NSObject {
     func currentPageButtonDidChange(view: KMReadModelView, sender: Any, pageIndex: Int)
     func scaleDidChange(view: KMReadModelView, sender: Any, type: KMReadModelViewScaleType)
     func cancelReadModel(view: KMReadModelView, sender: Any)
+    
+    func readModelViewWidthChange(view: KMReadModelView, width: CGFloat)
 }
 
 class KMReadModelView: KMBaseXibView {
@@ -75,6 +77,10 @@ class KMReadModelView: KMBaseXibView {
     @IBOutlet weak var currentPageBackgroundView: NSView!
     @IBOutlet weak var contentBox: KMBox!
     
+    @IBOutlet weak var contentViewWidthConstraint: NSLayoutConstraint!
+    @IBOutlet weak var currentContentViewWidthConstraint: NSLayoutConstraint!
+    @IBOutlet weak var totalPageCountWidthConstraint: NSLayoutConstraint!
+    @IBOutlet weak var scaleWidthConstraint: NSLayoutConstraint!
     
     var firstPageButton: KMDesignButton!
     var beforePageButton: KMDesignButton!
@@ -89,6 +95,7 @@ class KMReadModelView: KMBaseXibView {
         didSet {
             self.currentPageTextField.stringValue = (currentPageIndex! + 1).description
             self.updateButtonState()
+            self.updateUI()
         }
     }
     
@@ -96,6 +103,7 @@ class KMReadModelView: KMBaseXibView {
         didSet {
             self.totalLable.stringValue = totalPagesCount?.description ?? "1"
             self.updateButtonState()
+            self.updateUI()
         }
     }
     
@@ -135,6 +143,8 @@ class KMReadModelView: KMBaseXibView {
         firstPageButton.image_disabled = NSImage(named: "icon_btn_readModel_first_dis")!
         firstPageButton.action = #selector(firstPageButtonAction)
         firstPageButton.pagination()
+        firstPageButton.borderWidth = 1
+        firstPageButton.borderColor = NSColor(hex: "#DFE1E5")
         firstPageButton.updateUI()
         
         beforePageButton = KMDesignButton(withType: .Image)
@@ -145,6 +155,9 @@ class KMReadModelView: KMBaseXibView {
         beforePageButton.image_disabled = NSImage(named: "icon_btn_readModel_before_dis")!
         beforePageButton.action = #selector(beforePageButtonAction)
         beforePageButton.pagination()
+        beforePageButton.borderWidth = 1
+        beforePageButton.borderColor = NSColor(hex: "#DFE1E5")
+        beforePageButton.updateUI()
         
         afterPageButton = KMDesignButton(withType: .Image)
         self.afterPageView.addSubview(afterPageButton.view)
@@ -154,6 +167,9 @@ class KMReadModelView: KMBaseXibView {
         afterPageButton.image_disabled = NSImage(named: "icon_btn_readModel_after_dis")!
         afterPageButton.action = #selector(afterPageButtonAction)
         afterPageButton.pagination()
+        afterPageButton.borderWidth = 1
+        afterPageButton.borderColor = NSColor(hex: "#DFE1E5")
+        afterPageButton.updateUI()
         
         lastPageButton = KMDesignButton(withType: .Image)
         self.lastPageView.addSubview(lastPageButton.view)
@@ -163,6 +179,9 @@ class KMReadModelView: KMBaseXibView {
         lastPageButton.image_disabled = NSImage(named: "icon_btn_readModel_last_dis")!
         lastPageButton.action = #selector(lastPageButtonAction)
         lastPageButton.pagination()
+        lastPageButton.borderWidth = 1
+        lastPageButton.borderColor = NSColor(hex: "#DFE1E5")
+        lastPageButton.updateUI()
         
         zoomButton = KMDesignSelect(withType: .PopButton)
         self.zoomView.addSubview(zoomButton.view)
@@ -173,6 +192,7 @@ class KMReadModelView: KMBaseXibView {
         zoomButton.font_hov = NSFont.SFProTextRegular(12.0)
         zoomButton.font_focus = NSFont.SFProTextRegular(12.0)
         zoomButton.font_disabled = NSFont.SFProTextRegular(12.0)
+        zoomButton.borderWidth = 0
         zoomButton.updateUI()
         
         currentPageBackgroundView.border(NSColor(hex: "#DFE1E5"), 1, 4)
@@ -204,7 +224,15 @@ class KMReadModelView: KMBaseXibView {
     }
     
     override func updateUI() {
-        
+        let width = self.fetchWidth()
+//        if self.contentViewWidthConstraint.constant != width {
+            self.delegate?.readModelViewWidthChange(view: self, width: width)
+//        }
+        self.contentViewWidthConstraint.constant = width
+        self.currentContentViewWidthConstraint.constant = self.fetchCurrentPageIndexWidth(string: self.currentPageTextField.stringValue as NSString)
+        self.totalPageCountWidthConstraint.constant = self.fetchTotalPageIndexWidth(string: self.totalPageView.stringValue as NSString)
+        self.scaleWidthConstraint.constant = self.fetchScaleWidth(string: self.zoomButton.stringValue as NSString)
+        zoomButton.view.frame = self.zoomView.bounds
     }
     
     override func resetData() {
@@ -218,14 +246,55 @@ class KMReadModelView: KMBaseXibView {
     override func removeNotification() {
         
     }
-    
-    @IBAction func escButtonAction(_ sender: Any) {
-        print("read model escButtonAction")
-        self.delegate?.cancelReadModel(view: self, sender: sender)
-    }
-    
 }
 
+//MARK: data
+extension KMReadModelView {
+    func fetchWidth() -> CGFloat {
+        var width = 16.0
+        width += self.firstPageView.frame.size.width
+        width += 8.0
+        width += self.beforePageView.frame.size.width
+        width += 8.0
+        width += self.fetchCurrentPageIndexWidth(string: self.currentPageTextField.stringValue as NSString)
+        width += 8.0
+        width += 4.0
+        width += 8.0
+        width += self.fetchTotalPageIndexWidth(string: self.totalLable.stringValue as NSString)
+        width += 8.0
+        width += self.afterPageView.frame.size.width
+        width += 8.0
+        width += self.lastPageView.frame.size.width
+        width += 16.0
+        width += self.fetchScaleWidth(string: self.zoomButton.stringValue as NSString)
+        width += 16.0
+        return width
+    }
+    
+    func fetchCurrentPageIndexWidth(string: NSString) -> CGFloat {
+        var width = 28.0
+        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0)]
+        width += string.boundingRect(with: CGSize(width: 100, height: 24), attributes: attributes).size.width
+        width = max(width, 48)
+        return width
+    }
+    
+    func fetchTotalPageIndexWidth(string: NSString) -> CGFloat {
+        var width = 0.0
+        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0)]
+        width += string.boundingRect(with: CGSize(width: 100, height: 24), attributes: attributes).size.width
+        width = max(width, 30)
+        return width
+    }
+    
+    func fetchScaleWidth(string: NSString) -> CGFloat {
+        var width = 40.0
+        let attributes = [NSAttributedString.Key.font : NSFont.SFProTextRegular(12.0)]
+        width += string.boundingRect(with: CGSize(width: 100, height: 24), attributes: attributes).size.width
+        width = max(width, 80)
+        return width
+    }
+}
 //MARK: Mouse
 extension KMReadModelView {
     override func mouseDown(with event: NSEvent) {
@@ -253,6 +322,7 @@ extension KMReadModelView {
 extension KMReadModelView: KMSelectPopButtonDelegate {
     func km_comboBoxSelectionDidChange(_ obj: KMDesignSelect) {
         print("km_comboBoxSelectionDidChange")
+        self.updateUI()
         self.delegate?.scaleDidChange(view: self, sender: obj, type: KMReadModelViewScaleType(rawValue: KMReadModelViewScaleType.allValues()[obj.indexOfSelectedItem]) ?? .autoSize)
     }
 }
@@ -270,6 +340,7 @@ extension KMReadModelView: NSTextFieldDelegate {
 extension KMReadModelView {
     @objc fileprivate func inReadModelView() {
         self.endTimer()
+        self.updateUI()
         NSAnimationContext.runAnimationGroup { NSAnimationContext in
             self.animator().alphaValue = 1
         }
@@ -303,11 +374,9 @@ extension KMReadModelView {
 
 //MARK: Action
 extension KMReadModelView {
-    func updateButtonState() {
-        self.firstPageButton.enabled = self.canFirstPageButtonAction()
-        self.beforePageButton.enabled = self.canBeforePageButtonAction()
-        self.afterPageButton.enabled = self.canAfterPageButtonAction()
-        self.lastPageButton.enabled = self.canLastPageButtonAction()
+    @IBAction func escButtonAction(_ sender: Any) {
+        print("read model escButtonAction")
+        self.delegate?.cancelReadModel(view: self, sender: sender)
     }
     
     @objc func firstPageButtonAction(sender: Any) {
@@ -383,4 +452,11 @@ extension KMReadModelView {
             return false
         }
     }
+    
+    func updateButtonState() {
+        self.firstPageButton.enabled = self.canFirstPageButtonAction()
+        self.beforePageButton.enabled = self.canBeforePageButtonAction()
+        self.afterPageButton.enabled = self.canAfterPageButtonAction()
+        self.lastPageButton.enabled = self.canLastPageButtonAction()
+    }
 }

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/KMReadModelView.xib

@@ -11,12 +11,16 @@
                 <outlet property="backgroundContentView" destination="Ekg-BM-HXY" id="7Ro-oj-0oJ"/>
                 <outlet property="beforePageView" destination="Jgr-1w-7HH" id="9d0-OJ-x1P"/>
                 <outlet property="contentBox" destination="AVK-lu-Leb" id="vcC-Qr-T0Z"/>
+                <outlet property="contentViewWidthConstraint" destination="l3h-KR-r6q" id="JFA-MD-ZYA"/>
+                <outlet property="currentContentViewWidthConstraint" destination="321-bu-1gf" id="avg-oO-amU"/>
                 <outlet property="currentPageBackgroundView" destination="AIV-yC-lIB" id="bAA-yY-uao"/>
                 <outlet property="currentPageTextField" destination="ABY-AC-itZ" id="HI2-Fy-Dg5"/>
                 <outlet property="currentPageView" destination="AIV-yC-lIB" id="eBU-oF-3ms"/>
                 <outlet property="firstPageView" destination="dsb-fw-TsG" id="UGo-cg-cdc"/>
                 <outlet property="lastPageView" destination="P1S-0d-t1u" id="vL4-tg-N7n"/>
+                <outlet property="scaleWidthConstraint" destination="d6e-kn-WQX" id="NLM-yh-Ybb"/>
                 <outlet property="totalLable" destination="Uq3-Xy-NP6" id="tBm-kT-xbG"/>
+                <outlet property="totalPageCountWidthConstraint" destination="LxH-1w-hav" id="5j1-xZ-mZp"/>
                 <outlet property="totalPageView" destination="Uq3-Xy-NP6" id="6Kf-Mm-9HO"/>
                 <outlet property="zoomView" destination="CGn-Xb-47o" id="p2X-hP-beZ"/>
             </connections>
@@ -24,119 +28,97 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="892" height="32"/>
+            <rect key="frame" x="0.0" y="0.0" width="624" height="32"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ekg-BM-HXY">
-                    <rect key="frame" x="269" y="0.0" width="355" height="32"/>
+                    <rect key="frame" x="122" y="0.0" width="380" height="32"/>
                     <subviews>
                         <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="AVK-lu-Leb" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="0.0" width="355" height="32"/>
+                            <rect key="frame" x="0.0" y="0.0" width="380" height="32"/>
                             <view key="contentView" id="U9O-MP-lEy">
-                                <rect key="frame" x="0.0" y="0.0" width="355" height="32"/>
+                                <rect key="frame" x="0.0" y="0.0" width="380" height="32"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             </view>
                         </box>
-                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="Lht-Q7-2qw">
-                            <rect key="frame" x="16" y="0.0" width="244" height="32"/>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f1L-0R-P0b">
+                            <rect key="frame" x="134" y="8" width="8" height="16"/>
+                            <textFieldCell key="cell" lineBreakMode="clipping" title="/" id="KPK-HV-Rlo">
+                                <font key="font" usesAppearanceFont="YES"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Uq3-Xy-NP6">
+                            <rect key="frame" x="146" y="8" width="52" height="16"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="48" id="LxH-1w-hav"/>
+                            </constraints>
+                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="200" id="dIG-D4-V15">
+                                <font key="font" metaFont="system"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="ViC-c6-CX9">
+                            <rect key="frame" x="204" y="4" width="24" height="24"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="24" id="LcA-93-HMl"/>
+                                <constraint firstAttribute="width" constant="24" id="ymN-u2-iOX"/>
+                            </constraints>
+                        </customView>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="P1S-0d-t1u">
+                            <rect key="frame" x="236" y="4" width="24" height="24"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="24" id="chk-ID-4Py"/>
+                                <constraint firstAttribute="height" constant="24" id="lb7-eu-DSt"/>
+                            </constraints>
+                        </customView>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="Jgr-1w-7HH">
+                            <rect key="frame" x="48" y="4" width="24" height="24"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="24" id="BcB-Fz-hsf"/>
+                                <constraint firstAttribute="height" constant="24" id="uTr-Eh-8MQ"/>
+                            </constraints>
+                        </customView>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="AIV-yC-lIB">
+                            <rect key="frame" x="80" y="4" width="48" height="24"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f1L-0R-P0b">
-                                    <rect key="frame" x="118" y="8" width="8" height="16"/>
-                                    <textFieldCell key="cell" lineBreakMode="clipping" title="/" id="KPK-HV-Rlo">
+                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ABY-AC-itZ">
+                                    <rect key="frame" x="6" y="4" width="36" height="16"/>
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="left" id="L85-Ts-sfU">
                                         <font key="font" usesAppearanceFont="YES"/>
-                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Uq3-Xy-NP6">
-                                    <rect key="frame" x="130" y="8" width="52" height="16"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="48" id="LxH-1w-hav"/>
-                                    </constraints>
-                                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="200" id="dIG-D4-V15">
-                                        <font key="font" metaFont="system"/>
-                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                </textField>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="ViC-c6-CX9">
-                                    <rect key="frame" x="188" y="4" width="24" height="24"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="24" id="LcA-93-HMl"/>
-                                        <constraint firstAttribute="width" constant="24" id="ymN-u2-iOX"/>
-                                    </constraints>
-                                </customView>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="P1S-0d-t1u">
-                                    <rect key="frame" x="220" y="4" width="24" height="24"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="24" id="chk-ID-4Py"/>
-                                        <constraint firstAttribute="height" constant="24" id="lb7-eu-DSt"/>
-                                    </constraints>
-                                </customView>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Jgr-1w-7HH">
-                                    <rect key="frame" x="32" y="4" width="24" height="24"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="24" id="BcB-Fz-hsf"/>
-                                        <constraint firstAttribute="height" constant="24" id="uTr-Eh-8MQ"/>
-                                    </constraints>
-                                </customView>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="AIV-yC-lIB">
-                                    <rect key="frame" x="64" y="4" width="48" height="24"/>
-                                    <subviews>
-                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ABY-AC-itZ">
-                                            <rect key="frame" x="6" y="4" width="36" height="16"/>
-                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="left" id="L85-Ts-sfU">
-                                                <font key="font" usesAppearanceFont="YES"/>
-                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            </textFieldCell>
-                                        </textField>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="48" id="321-bu-1gf"/>
-                                        <constraint firstItem="ABY-AC-itZ" firstAttribute="centerX" secondItem="AIV-yC-lIB" secondAttribute="centerX" id="98j-Qb-85F"/>
-                                        <constraint firstAttribute="trailing" secondItem="ABY-AC-itZ" secondAttribute="trailing" constant="8" id="NQr-NY-HC5"/>
-                                        <constraint firstItem="ABY-AC-itZ" firstAttribute="leading" secondItem="AIV-yC-lIB" secondAttribute="leading" constant="8" id="Psa-9P-esy"/>
-                                        <constraint firstAttribute="height" constant="24" id="Twj-Ld-Y2Z"/>
-                                        <constraint firstItem="ABY-AC-itZ" firstAttribute="centerY" secondItem="AIV-yC-lIB" secondAttribute="centerY" id="Xve-Md-D7Q"/>
-                                        <constraint firstItem="ABY-AC-itZ" firstAttribute="centerX" secondItem="AIV-yC-lIB" secondAttribute="centerX" id="jjz-0O-2F7"/>
-                                    </constraints>
-                                </customView>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="dsb-fw-TsG">
-                                    <rect key="frame" x="0.0" y="4" width="24" height="24"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="24" id="Gpv-Bh-Yv2"/>
-                                        <constraint firstAttribute="height" constant="24" id="Koo-wr-uc6"/>
-                                    </constraints>
-                                </customView>
                             </subviews>
                             <constraints>
-                                <constraint firstItem="f1L-0R-P0b" firstAttribute="leading" secondItem="AIV-yC-lIB" secondAttribute="trailing" constant="8" id="6FG-Rg-QNc"/>
-                                <constraint firstItem="dsb-fw-TsG" firstAttribute="centerY" secondItem="Lht-Q7-2qw" secondAttribute="centerY" id="6UW-xG-snB"/>
-                                <constraint firstItem="Jgr-1w-7HH" firstAttribute="centerY" secondItem="Lht-Q7-2qw" secondAttribute="centerY" id="8D5-RV-LVC"/>
-                                <constraint firstItem="f1L-0R-P0b" firstAttribute="centerY" secondItem="Lht-Q7-2qw" secondAttribute="centerY" id="8ZW-2A-3k3"/>
-                                <constraint firstItem="ViC-c6-CX9" firstAttribute="centerY" secondItem="Lht-Q7-2qw" secondAttribute="centerY" id="AmR-up-WTR"/>
-                                <constraint firstItem="AIV-yC-lIB" firstAttribute="leading" secondItem="Jgr-1w-7HH" secondAttribute="trailing" constant="8" id="EEu-fW-6Hc"/>
-                                <constraint firstItem="ViC-c6-CX9" firstAttribute="leading" secondItem="Uq3-Xy-NP6" secondAttribute="trailing" constant="8" id="Q7a-xg-Lhf"/>
-                                <constraint firstItem="Uq3-Xy-NP6" firstAttribute="centerY" secondItem="Lht-Q7-2qw" secondAttribute="centerY" id="VmS-Ea-7ig"/>
-                                <constraint firstItem="f1L-0R-P0b" firstAttribute="centerX" secondItem="Lht-Q7-2qw" secondAttribute="centerX" id="Xa0-1t-Gg3"/>
-                                <constraint firstItem="Uq3-Xy-NP6" firstAttribute="leading" secondItem="f1L-0R-P0b" secondAttribute="trailing" constant="8" id="YJQ-76-ceg"/>
-                                <constraint firstItem="P1S-0d-t1u" firstAttribute="leading" secondItem="ViC-c6-CX9" secondAttribute="trailing" constant="8" id="aQp-VG-Tb9"/>
-                                <constraint firstItem="AIV-yC-lIB" firstAttribute="centerY" secondItem="Lht-Q7-2qw" secondAttribute="centerY" id="gEF-n0-Luf"/>
-                                <constraint firstItem="P1S-0d-t1u" firstAttribute="centerY" secondItem="Lht-Q7-2qw" secondAttribute="centerY" id="n80-Qu-Jbz"/>
-                                <constraint firstItem="Jgr-1w-7HH" firstAttribute="leading" secondItem="dsb-fw-TsG" secondAttribute="trailing" constant="8" id="ujs-T3-myP"/>
-                                <constraint firstAttribute="width" constant="244" id="vUM-UO-azI"/>
+                                <constraint firstAttribute="width" constant="48" id="321-bu-1gf"/>
+                                <constraint firstItem="ABY-AC-itZ" firstAttribute="centerX" secondItem="AIV-yC-lIB" secondAttribute="centerX" id="98j-Qb-85F"/>
+                                <constraint firstAttribute="trailing" secondItem="ABY-AC-itZ" secondAttribute="trailing" constant="8" id="NQr-NY-HC5"/>
+                                <constraint firstItem="ABY-AC-itZ" firstAttribute="leading" secondItem="AIV-yC-lIB" secondAttribute="leading" constant="8" id="Psa-9P-esy"/>
+                                <constraint firstAttribute="height" constant="24" id="Twj-Ld-Y2Z"/>
+                                <constraint firstItem="ABY-AC-itZ" firstAttribute="centerY" secondItem="AIV-yC-lIB" secondAttribute="centerY" id="Xve-Md-D7Q"/>
+                                <constraint firstItem="ABY-AC-itZ" firstAttribute="centerX" secondItem="AIV-yC-lIB" secondAttribute="centerX" id="jjz-0O-2F7"/>
+                            </constraints>
+                        </customView>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="dsb-fw-TsG">
+                            <rect key="frame" x="16" y="4" width="24" height="24"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="24" id="Gpv-Bh-Yv2"/>
+                                <constraint firstAttribute="height" constant="24" id="Koo-wr-uc6"/>
                             </constraints>
                         </customView>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="CGn-Xb-47o">
-                            <rect key="frame" x="274" y="4" width="65" height="24"/>
+                            <rect key="frame" x="276" y="4" width="100" height="24"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="24" id="7M3-Vw-gHr"/>
-                                <constraint firstAttribute="width" constant="65" id="d6e-kn-WQX"/>
+                                <constraint firstAttribute="width" constant="100" id="d6e-kn-WQX"/>
                             </constraints>
                         </customView>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DvG-ba-yw1">
-                            <rect key="frame" x="177" y="16" width="0.0" height="0.0"/>
+                            <rect key="frame" x="190" y="16" width="0.0" height="0.0"/>
                             <constraints>
                                 <constraint firstAttribute="width" id="Q3R-gB-Urn"/>
                                 <constraint firstAttribute="height" id="twJ-eQ-arB"/>
@@ -155,19 +137,30 @@ Gw
                         </button>
                     </subviews>
                     <constraints>
-                        <constraint firstItem="Lht-Q7-2qw" firstAttribute="top" secondItem="Ekg-BM-HXY" secondAttribute="top" id="0CG-tX-hCI"/>
-                        <constraint firstItem="Lht-Q7-2qw" firstAttribute="leading" secondItem="Ekg-BM-HXY" secondAttribute="leading" constant="16" id="83w-0W-xbD"/>
+                        <constraint firstItem="Jgr-1w-7HH" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="0F2-8V-SUX"/>
+                        <constraint firstItem="AIV-yC-lIB" firstAttribute="leading" secondItem="Jgr-1w-7HH" secondAttribute="trailing" constant="8" id="1Z5-M6-f9S"/>
+                        <constraint firstItem="ViC-c6-CX9" firstAttribute="leading" secondItem="Uq3-Xy-NP6" secondAttribute="trailing" constant="8" id="5EZ-zG-wPG"/>
+                        <constraint firstItem="ViC-c6-CX9" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="6Yf-yp-zkA"/>
+                        <constraint firstItem="AIV-yC-lIB" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="9GW-de-4YL"/>
+                        <constraint firstItem="P1S-0d-t1u" firstAttribute="leading" secondItem="ViC-c6-CX9" secondAttribute="trailing" constant="8" id="9h4-uD-Brm"/>
                         <constraint firstItem="AVK-lu-Leb" firstAttribute="top" secondItem="Ekg-BM-HXY" secondAttribute="top" id="FR5-kz-4JU"/>
                         <constraint firstItem="CGn-Xb-47o" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="FwP-Qt-NQA"/>
-                        <constraint firstAttribute="trailing" secondItem="CGn-Xb-47o" secondAttribute="trailing" constant="16" id="G3Z-Uj-byp"/>
+                        <constraint firstItem="dsb-fw-TsG" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="HzC-1S-ahY"/>
+                        <constraint firstItem="f1L-0R-P0b" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="NgD-qG-Mlp"/>
+                        <constraint firstItem="Jgr-1w-7HH" firstAttribute="leading" secondItem="dsb-fw-TsG" secondAttribute="trailing" constant="8" id="Q4F-6m-dJ8"/>
                         <constraint firstAttribute="bottom" secondItem="AVK-lu-Leb" secondAttribute="bottom" id="Uj0-aN-kQl"/>
                         <constraint firstItem="DvG-ba-yw1" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="VHF-Ky-QWK"/>
+                        <constraint firstItem="Uq3-Xy-NP6" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="WhW-Gj-Nqt"/>
+                        <constraint firstItem="f1L-0R-P0b" firstAttribute="leading" secondItem="AIV-yC-lIB" secondAttribute="trailing" constant="8" id="Ww3-Fr-XZL"/>
                         <constraint firstAttribute="height" constant="32" id="ap4-vg-VgW"/>
                         <constraint firstAttribute="trailing" secondItem="AVK-lu-Leb" secondAttribute="trailing" id="cTm-Vl-VkA"/>
+                        <constraint firstItem="CGn-Xb-47o" firstAttribute="leading" secondItem="P1S-0d-t1u" secondAttribute="trailing" constant="16" id="d2R-7s-3kc"/>
                         <constraint firstItem="AVK-lu-Leb" firstAttribute="leading" secondItem="Ekg-BM-HXY" secondAttribute="leading" id="dZY-QW-Bwm"/>
-                        <constraint firstAttribute="width" constant="355" id="l3h-KR-r6q"/>
+                        <constraint firstItem="Uq3-Xy-NP6" firstAttribute="leading" secondItem="f1L-0R-P0b" secondAttribute="trailing" constant="8" id="dlb-Or-tIs"/>
+                        <constraint firstItem="P1S-0d-t1u" firstAttribute="centerY" secondItem="Ekg-BM-HXY" secondAttribute="centerY" id="gzq-vh-3zy"/>
+                        <constraint firstAttribute="width" constant="380" id="l3h-KR-r6q"/>
                         <constraint firstItem="DvG-ba-yw1" firstAttribute="centerX" secondItem="Ekg-BM-HXY" secondAttribute="centerX" id="nbD-FQ-Pm1"/>
-                        <constraint firstAttribute="bottom" secondItem="Lht-Q7-2qw" secondAttribute="bottom" id="vi9-2p-JX2"/>
+                        <constraint firstItem="dsb-fw-TsG" firstAttribute="leading" secondItem="Ekg-BM-HXY" secondAttribute="leading" constant="16" id="r1M-vw-FPw"/>
                     </constraints>
                 </customView>
             </subviews>
@@ -175,7 +168,7 @@ Gw
                 <constraint firstItem="Ekg-BM-HXY" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="GRe-hU-qPQ"/>
                 <constraint firstItem="Ekg-BM-HXY" firstAttribute="centerX" secondItem="c22-O7-iKe" secondAttribute="centerX" id="Go3-Hf-mKm"/>
             </constraints>
-            <point key="canvasLocation" x="217" y="48"/>
+            <point key="canvasLocation" x="89" y="152"/>
         </customView>
     </objects>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_after.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon btn.pdf",
+      "filename" : "style=forward, state=norm.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_after.imageset/icon btn.pdf

@@ -1,145 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-0.000000 20.000000 m
-0.000000 22.209139 1.790861 24.000000 4.000000 24.000000 c
-20.000000 24.000000 l
-22.209139 24.000000 24.000000 22.209139 24.000000 20.000000 c
-24.000000 4.000000 l
-24.000000 1.790861 22.209139 0.000000 20.000000 0.000000 c
-4.000000 0.000000 l
-1.790861 0.000000 0.000000 1.790861 0.000000 4.000000 c
-0.000000 20.000000 l
-h
-W*
-n
-q
-1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
-0.874510 0.882353 0.898039 scn
-4.000000 23.000000 m
-20.000000 23.000000 l
-20.000000 25.000000 l
-4.000000 25.000000 l
-4.000000 23.000000 l
-h
-23.000000 20.000000 m
-23.000000 4.000000 l
-25.000000 4.000000 l
-25.000000 20.000000 l
-23.000000 20.000000 l
-h
-20.000000 1.000000 m
-4.000000 1.000000 l
-4.000000 -1.000000 l
-20.000000 -1.000000 l
-20.000000 1.000000 l
-h
-1.000000 4.000000 m
-1.000000 20.000000 l
--1.000000 20.000000 l
--1.000000 4.000000 l
-1.000000 4.000000 l
-h
-4.000000 1.000000 m
-2.343146 1.000000 1.000000 2.343145 1.000000 4.000000 c
--1.000000 4.000000 l
--1.000000 1.238577 1.238577 -1.000000 4.000000 -1.000000 c
-4.000000 1.000000 l
-h
-23.000000 4.000000 m
-23.000000 2.343145 21.656855 1.000000 20.000000 1.000000 c
-20.000000 -1.000000 l
-22.761423 -1.000000 25.000000 1.238577 25.000000 4.000000 c
-23.000000 4.000000 l
-h
-20.000000 23.000000 m
-21.656855 23.000000 23.000000 21.656855 23.000000 20.000000 c
-25.000000 20.000000 l
-25.000000 22.761423 22.761423 25.000000 20.000000 25.000000 c
-20.000000 23.000000 l
-h
-4.000000 25.000000 m
-1.238576 25.000000 -1.000000 22.761423 -1.000000 20.000000 c
-1.000000 20.000000 l
-1.000000 21.656855 2.343146 23.000000 4.000000 23.000000 c
-4.000000 25.000000 l
-h
-f
-n
-Q
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 5.000000 7.869629 cm
-0.380392 0.392157 0.411765 scn
-11.389303 4.880327 m
-0.000000 4.880328 l
-0.000000 3.380328 l
-11.389328 3.380327 l
-9.069671 1.060669 l
-10.130330 0.000010 l
-13.730306 3.599985 l
-14.023199 3.892878 14.023199 4.367751 13.730306 4.660645 c
-10.130330 8.260620 l
-9.069671 7.199960 l
-11.389303 4.880327 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  2014
-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
-0000002104 00000 n
-0000002127 00000 n
-0000002300 00000 n
-0000002374 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-2433
-%%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_after.imageset/style=forward, state=norm.pdf

@@ -0,0 +1,74 @@
+%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 11.750000 2.269775 cm
+0.380392 0.392157 0.411765 scn
+1.810660 5.630276 m
+6.380283 10.199899 l
+5.319623 11.260559 l
+0.219670 6.160606 l
+-0.073223 5.867713 -0.073223 5.392839 0.219670 5.099946 c
+5.319623 -0.000007 l
+6.380283 1.060654 l
+1.810660 5.630276 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  332
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.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
+0000000422 00000 n
+0000000444 00000 n
+0000000617 00000 n
+0000000691 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+750
+%%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_after_dis.imageset/style=forward, state=dis.pdf

@@ -10,19 +10,16 @@ stream
 /DeviceRGB CS
 /DeviceRGB cs
 q
-1.000000 0.000000 -0.000000 1.000000 1.000000 3.869690 cm
+-1.000000 -0.000000 -0.000000 1.000000 11.750000 2.269775 cm
 0.694118 0.701961 0.721569 scn
-11.389303 4.880312 m
-0.000000 4.880313 l
-0.000000 3.380313 l
-11.389328 3.380312 l
-9.069671 1.060654 l
-10.130330 -0.000006 l
-13.730306 3.599969 l
-14.023199 3.892862 14.023199 4.367736 13.730306 4.660629 c
-10.130330 8.260605 l
-9.069671 7.199944 l
-11.389303 4.880312 l
+1.810660 5.630276 m
+6.380283 10.199899 l
+5.319623 11.260559 l
+0.219670 6.160606 l
+-0.073223 5.867713 -0.073223 5.392839 0.219670 5.099946 c
+5.319623 -0.000007 l
+6.380283 1.060654 l
+1.810660 5.630276 l
 h
 f*
 n
@@ -32,7 +29,7 @@ endstream
 endobj
 
 3 0 obj
-  394
+  332
 endobj
 
 4 0 obj
@@ -63,15 +60,15 @@ xref
 0000000000 65535 f
 0000000010 00000 n
 0000000034 00000 n
-0000000484 00000 n
-0000000506 00000 n
-0000000679 00000 n
-0000000753 00000 n
+0000000422 00000 n
+0000000444 00000 n
+0000000617 00000 n
+0000000691 00000 n
 trailer
 << /ID [ (some) (id) ]
    /Root 6 0 R
    /Size 7
 >>
 startxref
-812
+750
 %%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_before.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon btn.pdf",
+      "filename" : "style=back, state=norm.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_before.imageset/icon btn.pdf

@@ -1,145 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-0.000000 20.000000 m
-0.000000 22.209139 1.790861 24.000000 4.000000 24.000000 c
-20.000000 24.000000 l
-22.209139 24.000000 24.000000 22.209139 24.000000 20.000000 c
-24.000000 4.000000 l
-24.000000 1.790861 22.209139 0.000000 20.000000 0.000000 c
-4.000000 0.000000 l
-1.790861 0.000000 0.000000 1.790861 0.000000 4.000000 c
-0.000000 20.000000 l
-h
-W*
-n
-q
-1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
-0.874510 0.882353 0.898039 scn
-4.000000 23.000000 m
-20.000000 23.000000 l
-20.000000 25.000000 l
-4.000000 25.000000 l
-4.000000 23.000000 l
-h
-23.000000 20.000000 m
-23.000000 4.000000 l
-25.000000 4.000000 l
-25.000000 20.000000 l
-23.000000 20.000000 l
-h
-20.000000 1.000000 m
-4.000000 1.000000 l
-4.000000 -1.000000 l
-20.000000 -1.000000 l
-20.000000 1.000000 l
-h
-1.000000 4.000000 m
-1.000000 20.000000 l
--1.000000 20.000000 l
--1.000000 4.000000 l
-1.000000 4.000000 l
-h
-4.000000 1.000000 m
-2.343146 1.000000 1.000000 2.343145 1.000000 4.000000 c
--1.000000 4.000000 l
--1.000000 1.238577 1.238577 -1.000000 4.000000 -1.000000 c
-4.000000 1.000000 l
-h
-23.000000 4.000000 m
-23.000000 2.343145 21.656855 1.000000 20.000000 1.000000 c
-20.000000 -1.000000 l
-22.761423 -1.000000 25.000000 1.238577 25.000000 4.000000 c
-23.000000 4.000000 l
-h
-20.000000 23.000000 m
-21.656855 23.000000 23.000000 21.656855 23.000000 20.000000 c
-25.000000 20.000000 l
-25.000000 22.761423 22.761423 25.000000 20.000000 25.000000 c
-20.000000 23.000000 l
-h
-4.000000 25.000000 m
-1.238576 25.000000 -1.000000 22.761423 -1.000000 20.000000 c
-1.000000 20.000000 l
-1.000000 21.656855 2.343146 23.000000 4.000000 23.000000 c
-4.000000 25.000000 l
-h
-f
-n
-Q
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 5.049805 7.869629 cm
-0.380392 0.392157 0.411765 scn
-2.560660 4.880314 m
-4.880306 7.199960 l
-3.819645 8.260620 l
-0.219670 4.660645 l
--0.073223 4.367752 -0.073223 3.892878 0.219670 3.599985 c
-3.819645 0.000010 l
-4.880306 1.060669 l
-2.560661 3.380314 l
-13.949975 3.380314 l
-13.949975 4.880314 l
-2.560660 4.880314 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  2009
-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
-0000002099 00000 n
-0000002122 00000 n
-0000002295 00000 n
-0000002369 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-2428
-%%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_before.imageset/style=back, state=norm.pdf

@@ -0,0 +1,74 @@
+%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 4.250000 2.269775 cm
+0.380392 0.392157 0.411765 scn
+1.810660 5.630276 m
+6.380283 10.199899 l
+5.319623 11.260559 l
+0.219670 6.160606 l
+-0.073223 5.867713 -0.073223 5.392839 0.219670 5.099946 c
+5.319623 -0.000007 l
+6.380283 1.060654 l
+1.810660 5.630276 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  329
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.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
+0000000419 00000 n
+0000000441 00000 n
+0000000614 00000 n
+0000000688 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+747
+%%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_before_dis.imageset/style=back, state=dis.pdf

@@ -10,19 +10,16 @@ stream
 /DeviceRGB CS
 /DeviceRGB cs
 q
-1.000000 0.000000 -0.000000 1.000000 1.050049 3.869705 cm
+1.000000 0.000000 -0.000000 1.000000 4.250000 2.269775 cm
 0.694118 0.701961 0.721569 scn
-2.560660 4.880299 m
-4.880306 7.199944 l
-3.819645 8.260605 l
-0.219670 4.660629 l
--0.073223 4.367736 -0.073223 3.892863 0.219670 3.599969 c
-3.819645 -0.000006 l
-4.880306 1.060654 l
-2.560661 3.380299 l
-13.949975 3.380299 l
-13.949975 4.880299 l
-2.560660 4.880299 l
+1.810660 5.630276 m
+6.380283 10.199899 l
+5.319623 11.260559 l
+0.219670 6.160606 l
+-0.073223 5.867713 -0.073223 5.392839 0.219670 5.099946 c
+5.319623 -0.000007 l
+6.380283 1.060654 l
+1.810660 5.630276 l
 h
 f*
 n
@@ -32,7 +29,7 @@ endstream
 endobj
 
 3 0 obj
-  389
+  329
 endobj
 
 4 0 obj
@@ -63,15 +60,15 @@ xref
 0000000000 65535 f
 0000000010 00000 n
 0000000034 00000 n
-0000000479 00000 n
-0000000501 00000 n
-0000000674 00000 n
-0000000748 00000 n
+0000000419 00000 n
+0000000441 00000 n
+0000000614 00000 n
+0000000688 00000 n
 trailer
 << /ID [ (some) (id) ]
    /Root 6 0 R
    /Size 7
 >>
 startxref
-807
+747
 %%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_first.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon btn.pdf",
+      "filename" : "style=firstpage, state=norm.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_first.imageset/icon btn.pdf

@@ -1,151 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-0.000000 20.000000 m
-0.000000 22.209139 1.790861 24.000000 4.000000 24.000000 c
-20.000000 24.000000 l
-22.209139 24.000000 24.000000 22.209139 24.000000 20.000000 c
-24.000000 4.000000 l
-24.000000 1.790861 22.209139 0.000000 20.000000 0.000000 c
-4.000000 0.000000 l
-1.790861 0.000000 0.000000 1.790861 0.000000 4.000000 c
-0.000000 20.000000 l
-h
-W*
-n
-q
-1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
-0.874510 0.882353 0.898039 scn
-4.000000 23.000000 m
-20.000000 23.000000 l
-20.000000 25.000000 l
-4.000000 25.000000 l
-4.000000 23.000000 l
-h
-23.000000 20.000000 m
-23.000000 4.000000 l
-25.000000 4.000000 l
-25.000000 20.000000 l
-23.000000 20.000000 l
-h
-20.000000 1.000000 m
-4.000000 1.000000 l
-4.000000 -1.000000 l
-20.000000 -1.000000 l
-20.000000 1.000000 l
-h
-1.000000 4.000000 m
-1.000000 20.000000 l
--1.000000 20.000000 l
--1.000000 4.000000 l
-1.000000 4.000000 l
-h
-4.000000 1.000000 m
-2.343146 1.000000 1.000000 2.343145 1.000000 4.000000 c
--1.000000 4.000000 l
--1.000000 1.238577 1.238577 -1.000000 4.000000 -1.000000 c
-4.000000 1.000000 l
-h
-23.000000 4.000000 m
-23.000000 2.343145 21.656855 1.000000 20.000000 1.000000 c
-20.000000 -1.000000 l
-22.761423 -1.000000 25.000000 1.238577 25.000000 4.000000 c
-23.000000 4.000000 l
-h
-20.000000 23.000000 m
-21.656855 23.000000 23.000000 21.656855 23.000000 20.000000 c
-25.000000 20.000000 l
-25.000000 22.761423 22.761423 25.000000 20.000000 25.000000 c
-20.000000 23.000000 l
-h
-4.000000 25.000000 m
-1.238576 25.000000 -1.000000 22.761423 -1.000000 20.000000 c
-1.000000 20.000000 l
-1.000000 21.656855 2.343146 23.000000 4.000000 23.000000 c
-4.000000 25.000000 l
-h
-f
-n
-Q
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 5.250000 6.000000 cm
-0.380392 0.392157 0.411765 scn
-0.000000 12.000000 m
-0.000000 0.000000 l
-1.500000 0.000000 l
-1.500000 12.000000 l
-0.000000 12.000000 l
-h
-7.630306 9.069650 m
-5.310660 6.750004 l
-13.699975 6.750004 l
-13.699975 5.250004 l
-5.310661 5.250004 l
-7.630306 2.930359 l
-6.569645 1.869699 l
-2.969670 5.469675 l
-2.676777 5.762568 2.676777 6.237442 2.969670 6.530334 c
-6.569645 10.130310 l
-7.630306 9.069650 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  2113
-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
-0000002203 00000 n
-0000002226 00000 n
-0000002399 00000 n
-0000002473 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-2532
-%%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_first.imageset/style=firstpage, state=norm.pdf

@@ -0,0 +1,80 @@
+%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 3.250000 2.345062 cm
+0.380392 0.392157 0.411765 scn
+9.155596 10.250756 m
+4.560545 5.655705 l
+9.155596 1.060655 l
+8.094936 -0.000006 l
+2.969555 5.125375 l
+2.676662 5.418269 2.676662 5.893142 2.969555 6.186036 c
+8.094936 11.311417 l
+9.155596 10.250756 l
+h
+0.000000 11.155167 m
+0.000000 0.155167 l
+1.500000 0.155167 l
+1.500000 11.155167 l
+0.000000 11.155167 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  433
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.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
+0000000523 00000 n
+0000000545 00000 n
+0000000718 00000 n
+0000000792 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+851
+%%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_first_dis.imageset/style=firstpage, state=dis.pdf

@@ -10,25 +10,22 @@ stream
 /DeviceRGB CS
 /DeviceRGB cs
 q
-1.000000 0.000000 -0.000000 1.000000 1.250000 2.000000 cm
+1.000000 0.000000 -0.000000 1.000000 3.250000 2.345062 cm
 0.694118 0.701961 0.721569 scn
-0.000000 12.000000 m
-0.000000 0.000000 l
-1.500000 0.000000 l
-1.500000 12.000000 l
-0.000000 12.000000 l
+9.155596 10.250756 m
+4.560545 5.655705 l
+9.155596 1.060655 l
+8.094936 -0.000006 l
+2.969555 5.125375 l
+2.676662 5.418269 2.676662 5.893142 2.969555 6.186036 c
+8.094936 11.311417 l
+9.155596 10.250756 l
 h
-7.630306 9.069650 m
-5.310660 6.750004 l
-13.699975 6.750004 l
-13.699975 5.250004 l
-5.310661 5.250004 l
-7.630306 2.930359 l
-6.569645 1.869699 l
-2.969670 5.469675 l
-2.676777 5.762568 2.676777 6.237442 2.969670 6.530334 c
-6.569645 10.130310 l
-7.630306 9.069650 l
+0.000000 11.155167 m
+0.000000 0.155167 l
+1.500000 0.155167 l
+1.500000 11.155167 l
+0.000000 11.155167 l
 h
 f*
 n
@@ -38,7 +35,7 @@ endstream
 endobj
 
 3 0 obj
-  492
+  433
 endobj
 
 4 0 obj
@@ -69,15 +66,15 @@ xref
 0000000000 65535 f
 0000000010 00000 n
 0000000034 00000 n
-0000000582 00000 n
-0000000604 00000 n
-0000000777 00000 n
-0000000851 00000 n
+0000000523 00000 n
+0000000545 00000 n
+0000000718 00000 n
+0000000792 00000 n
 trailer
 << /ID [ (some) (id) ]
    /Root 6 0 R
    /Size 7
 >>
 startxref
-910
+851
 %%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_last.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon btn.pdf",
+      "filename" : "style=lastpage, state=norm.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_last.imageset/icon btn.pdf

@@ -1,151 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-0.000000 20.000000 m
-0.000000 22.209139 1.790861 24.000000 4.000000 24.000000 c
-20.000000 24.000000 l
-22.209139 24.000000 24.000000 22.209139 24.000000 20.000000 c
-24.000000 4.000000 l
-24.000000 1.790861 22.209139 0.000000 20.000000 0.000000 c
-4.000000 0.000000 l
-1.790861 0.000000 0.000000 1.790861 0.000000 4.000000 c
-0.000000 20.000000 l
-h
-W*
-n
-q
-1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
-0.874510 0.882353 0.898039 scn
-4.000000 23.000000 m
-20.000000 23.000000 l
-20.000000 25.000000 l
-4.000000 25.000000 l
-4.000000 23.000000 l
-h
-23.000000 20.000000 m
-23.000000 4.000000 l
-25.000000 4.000000 l
-25.000000 20.000000 l
-23.000000 20.000000 l
-h
-20.000000 1.000000 m
-4.000000 1.000000 l
-4.000000 -1.000000 l
-20.000000 -1.000000 l
-20.000000 1.000000 l
-h
-1.000000 4.000000 m
-1.000000 20.000000 l
--1.000000 20.000000 l
--1.000000 4.000000 l
-1.000000 4.000000 l
-h
-4.000000 1.000000 m
-2.343146 1.000000 1.000000 2.343145 1.000000 4.000000 c
--1.000000 4.000000 l
--1.000000 1.238577 1.238577 -1.000000 4.000000 -1.000000 c
-4.000000 1.000000 l
-h
-23.000000 4.000000 m
-23.000000 2.343145 21.656855 1.000000 20.000000 1.000000 c
-20.000000 -1.000000 l
-22.761423 -1.000000 25.000000 1.238577 25.000000 4.000000 c
-23.000000 4.000000 l
-h
-20.000000 23.000000 m
-21.656855 23.000000 23.000000 21.656855 23.000000 20.000000 c
-25.000000 20.000000 l
-25.000000 22.761423 22.761423 25.000000 20.000000 25.000000 c
-20.000000 23.000000 l
-h
-4.000000 25.000000 m
-1.238576 25.000000 -1.000000 22.761423 -1.000000 20.000000 c
-1.000000 20.000000 l
-1.000000 21.656855 2.343146 23.000000 4.000000 23.000000 c
-4.000000 25.000000 l
-h
-f
-n
-Q
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 5.000000 6.000000 cm
-0.380392 0.392157 0.411765 scn
-12.250000 12.000000 m
-12.250000 0.000000 l
-13.750000 0.000000 l
-13.750000 12.000000 l
-12.250000 12.000000 l
-h
-6.069670 2.930328 m
-8.389328 5.249987 l
-0.000000 5.249988 l
-0.000000 6.749988 l
-8.389303 6.749987 l
-6.069670 9.069619 l
-7.130331 10.130280 l
-10.730306 6.530304 l
-11.023199 6.237411 11.023199 5.762537 10.730306 5.469644 c
-7.130331 1.869669 l
-6.069670 2.930328 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  2120
-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
-0000002210 00000 n
-0000002233 00000 n
-0000002406 00000 n
-0000002480 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-2539
-%%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_last.imageset/style=lastpage, state=norm.pdf

@@ -0,0 +1,80 @@
+%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 12.405518 2.345062 cm
+0.380392 0.392157 0.411765 scn
+9.155596 10.250756 m
+4.560545 5.655705 l
+9.155596 1.060655 l
+8.094936 -0.000006 l
+2.969555 5.125375 l
+2.676662 5.418269 2.676662 5.893142 2.969555 6.186036 c
+8.094936 11.311417 l
+9.155596 10.250756 l
+h
+0.000000 11.155167 m
+0.000000 0.155167 l
+1.500000 0.155167 l
+1.500000 11.155167 l
+0.000000 11.155167 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  436
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.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
+0000000526 00000 n
+0000000548 00000 n
+0000000721 00000 n
+0000000795 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+854
+%%EOF

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/Source/KMReadModelView.xcassets/icon_btn_readModel_last_dis.imageset/style=lastpage, state=dis.pdf

@@ -10,25 +10,22 @@ stream
 /DeviceRGB CS
 /DeviceRGB cs
 q
-1.000000 0.000000 -0.000000 1.000000 1.000000 2.000000 cm
+-1.000000 -0.000000 -0.000000 1.000000 12.405518 2.345062 cm
 0.694118 0.701961 0.721569 scn
-12.250000 12.000000 m
-12.250000 0.000000 l
-13.750000 0.000000 l
-13.750000 12.000000 l
-12.250000 12.000000 l
+9.155596 10.250756 m
+4.560545 5.655705 l
+9.155596 1.060655 l
+8.094936 -0.000006 l
+2.969555 5.125375 l
+2.676662 5.418269 2.676662 5.893142 2.969555 6.186036 c
+8.094936 11.311417 l
+9.155596 10.250756 l
 h
-6.069670 2.930328 m
-8.389328 5.249987 l
-0.000000 5.249988 l
-0.000000 6.749988 l
-8.389303 6.749987 l
-6.069670 9.069619 l
-7.130331 10.130280 l
-10.730306 6.530304 l
-11.023199 6.237411 11.023199 5.762537 10.730306 5.469644 c
-7.130331 1.869669 l
-6.069670 2.930328 l
+0.000000 11.155167 m
+0.000000 0.155167 l
+1.500000 0.155167 l
+1.500000 11.155167 l
+0.000000 11.155167 l
 h
 f*
 n
@@ -38,7 +35,7 @@ endstream
 endobj
 
 3 0 obj
-  499
+  436
 endobj
 
 4 0 obj
@@ -69,15 +66,15 @@ xref
 0000000000 65535 f
 0000000010 00000 n
 0000000034 00000 n
-0000000589 00000 n
-0000000611 00000 n
-0000000784 00000 n
-0000000858 00000 n
+0000000526 00000 n
+0000000548 00000 n
+0000000721 00000 n
+0000000795 00000 n
 trailer
 << /ID [ (some) (id) ]
    /Root 6 0 R
    /Size 7
 >>
 startxref
-917
+854
 %%EOF

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -2480,6 +2480,12 @@ extension KMMainViewController: KMReadModelViewDelegate {
             self.closeReadModel()
         }
     }
+    
+    func readModelViewWidthChange(view: KMReadModelView, width: CGFloat) {
+//        if self.readModelViewWidthConstraint.constant != width {
+            self.readModelViewWidthConstraint.constant = width
+//        }
+    }
 }
 
 extension KMMainViewController: KMPageNumberDisplayViewDelegate {

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift

@@ -441,7 +441,7 @@ extension KMMainViewController {
         self.readModelView.beginTimer()
 //        self.listView.autoScales = true
 //        self.readModelView.scaleType = .autoSize
-        self.readModelView.zoomButton.stringValue = (self.listView.scaleFactor * 100).description + "%"
+        self.readModelView.zoomButton.stringValue = (NSString(format: "%.0f", self.listView.scaleFactor * 100) as String) + "%"
         
         //关闭左侧右侧菜单栏
         self.closeLeftPane()

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -36,6 +36,7 @@ import Cocoa
     @IBOutlet weak var readModelView: KMReadModelView!
     @IBOutlet weak var bottomAreaView: KMBox!
     var isReadMode: Bool = false
+    @IBOutlet weak var readModelViewWidthConstraint: NSLayoutConstraint!
     
     //页码显示器
     @IBOutlet weak var pageNumberDisplayView: KMPageNumberDisplayView!

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.xib

@@ -22,6 +22,7 @@
                 <outlet property="pdfSplitView" destination="r2n-G7-pBF" id="zCH-LA-o4V"/>
                 <outlet property="readContentView" destination="Qs2-A4-zLE" id="Oc4-ih-YsE"/>
                 <outlet property="readModelView" destination="3E1-9V-2lu" id="UgX-gC-aGe"/>
+                <outlet property="readModelViewWidthConstraint" destination="8go-j7-y2w" id="rT7-mj-MvK"/>
                 <outlet property="rightView" destination="0Bt-mG-vsA" id="pZR-oX-ScK"/>
                 <outlet property="secondaryPdfView" destination="Cyg-1v-mQT" id="FJh-z9-Seg"/>
                 <outlet property="tipCurrentPageBox" destination="zKE-Pq-I7d" id="CYY-Lt-phh"/>
@@ -74,9 +75,9 @@ Gw
                                             <rect key="frame" x="0.0" y="0.0" width="1000" height="578"/>
                                         </customView>
                                         <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3E1-9V-2lu" customClass="KMReadModelView" customModule="PDF_Master" customModuleProvider="target">
-                                            <rect key="frame" x="325" y="16" width="350" height="32"/>
+                                            <rect key="frame" x="300" y="16" width="400" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="width" constant="350" id="8go-j7-y2w"/>
+                                                <constraint firstAttribute="width" constant="400" id="8go-j7-y2w"/>
                                                 <constraint firstAttribute="height" constant="32" id="Opl-4j-wTU"/>
                                             </constraints>
                                         </customView>