【UI替换】编辑公寓 - 合并 添加文件

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/KMMergeWindowController.swift

@@ -56,7 +56,7 @@ class KMMergeWindowController: NSWindowController {
         // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
         
         mergeView.addFilesAction = { [unowned self] view in
-            
+            self.addFile()
         }
         
         mergeView.clearAction = { [unowned self] view in
@@ -72,3 +72,68 @@ class KMMergeWindowController: NSWindowController {
         }
     }
 }
+
+extension KMMergeWindowController {
+    func addFile() {
+        
+//        if (![IAPProductsManager defaultManager].isAvailableAllFunction) {
+//            //免費版只支援2個檔案做合併小于20M的文件合并
+//            if (_files.count >= 2 || self.allFileSize > (20 * 1024 * 1024)) {
+//    #if VERSION_DMG
+//                [[KMPurchaseCompareWindowController sharedInstance] showWindow:nil];
+//    #else
+//                KMToolCompareWindowController * vc = [KMToolCompareWindowController toolCompareWithType:KMCompareWithToolType_PageEdit setSelectIndex:1];
+//                [vc showWindow:nil];
+//    #endif
+//                return;
+//            }
+//            
+//        }
+        let openPanel = NSOpenPanel()
+        openPanel.allowedFileTypes = ["pdf"]
+
+        if KMPurchaseManager.manager.state == .subscription {
+            openPanel.allowsMultipleSelection = true
+            openPanel.message = NSLocalizedString("Select files to merge. To select multiple files press cmd ⌘ button on the keyboard and click on the target files one by one.", comment: "")
+        } else {
+            openPanel.allowsMultipleSelection = false
+            openPanel.message = NSLocalizedString("Select files to merge, only one file can be selected at a time.", comment: "")
+        }
+
+        openPanel.beginSheetModal(for: self.window!) { (result) in
+            if result == NSApplication.ModalResponse.OK {
+                var array: [URL] = []
+                for fileURL in openPanel.urls {
+                    array.append(fileURL)
+//                    if let filePath = fileURL.path {
+//                        if !FileManager.default.isExecutableFile(atPath: filePath) {
+//                            continue
+//                        }
+//
+//                        do {
+//                            let attrib = try FileManager.default.attributesOfItem(atPath: filePath)
+////                            if let fileSize = attrib[FileAttributeKey.size] as? NSNumber {
+////                                self.allFileSize += fileSize.floatValue
+////                            }
+////
+////                            if !IAPProductsManager.defaultManager.isAvailableAllFunction {
+////                                if self.allFileSize > (20 * 1024 * 1024) || self.files.count >= 2 {
+////                                    let vc = KMToolCompareWindowController.toolCompare(withType: .pageEdit, setSelectIndex: 1)
+////                                    vc?.showWindow(nil)
+////                                    self.allFileSize -= fileSize.floatValue
+////                                    self.addFiles(array)
+////                                    return
+////                                }
+////                            }
+//                            array.append(fileURL)
+//                        } catch {
+//                            print("Error getting file attributes: \(error)")
+//                        }
+//                    }
+                }
+                self.mergeView.addFilePaths(urls: array)
+            }
+        }
+
+    }
+}

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeBlankView/KMMergeBlankView.swift

@@ -8,6 +8,7 @@
 import Cocoa
 
 typealias KMMergeBlankViewDragAction = (_ view: KMMergeBlankView, _ fileNames: [URL]) -> Void
+typealias KMMergeBlankViewMouseDownAction = (_ view: KMMergeBlankView) -> Void
 class KMMergeBlankView: KMBaseXibView {
     @IBOutlet weak var selectViewBox: KMBox!
     @IBOutlet weak var iconImageView: NSImageView!
@@ -15,6 +16,7 @@ class KMMergeBlankView: KMBaseXibView {
     @IBOutlet weak var subTitleLabel: NSTextField!
     
     var dragAction: KMMergeBlankViewDragAction?
+    var mouseDownAction: KMMergeBlankViewMouseDownAction?
     
     override func draw(_ dirtyRect: NSRect) {
         super.draw(dirtyRect)
@@ -27,21 +29,23 @@ class KMMergeBlankView: KMBaseXibView {
         self.subTitleLabel.stringValue = NSLocalizedString("Drop files here or Click Add Files at upper left corner. You can drag files to reorder as you need.", comment: "")
         
         
-//        selectViewBox.moveCallback = { [unowned self] mouseEntered, mouseBox in
-//            if mouseEntered {
-//                iconImageView.image = NSImage(named: "KMImageNameEmptyListHov")
-//            } else {
-//                iconImageView.image = NSImage(named: "KMImageNameEmptyListNor")
-//            }
-//        }
-//        
-//        selectViewBox.downCallback = { [unowned self] downEntered, mouseBox, event in
-//            if downEntered {
-//                iconImageView.image = NSImage(named: "KMImageNameEmptyListPre")
-//            } else {
-//                iconImageView.image = NSImage(named: "KMImageNameEmptyListHov")
-//            }
-//        }
+        selectViewBox.moveCallback = { [unowned self] mouseEntered, mouseBox in
+            if mouseEntered {
+                iconImageView.image = NSImage(named: "KMImageNameEmptyListHov")
+            } else {
+                iconImageView.image = NSImage(named: "KMImageNameEmptyListNor")
+            }
+        }
+        
+        selectViewBox.downCallback = { [unowned self] downEntered, mouseBox, event in
+            if downEntered {
+                mouseDownAction?(self)
+                
+                iconImageView.image = NSImage(named: "KMImageNameEmptyListPre")
+            } else {
+                iconImageView.image = NSImage(named: "KMImageNameEmptyListHov")
+            }
+        }
         
         registerForDraggedTypes([.fileURL])
     }

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeBlankView/KMMergeBlankView.xib

@@ -9,6 +9,7 @@
         <customObject id="-2" userLabel="File's Owner" customClass="KMMergeBlankView" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="iconImageView" destination="Q2N-Tf-H5f" id="Afs-uj-IHu"/>
+                <outlet property="selectViewBox" destination="aZk-BO-dft" id="ntu-eC-x7V"/>
                 <outlet property="subTitleLabel" destination="5Oj-UO-Lu1" id="juH-rI-6Pj"/>
                 <outlet property="titleLable" destination="2fO-qA-Ys3" id="o2j-LY-F9d"/>
             </connections>
@@ -22,14 +23,6 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="VlN-ah-v0N">
                     <rect key="frame" x="103" y="42" width="275" height="188"/>
                     <subviews>
-                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Q2N-Tf-H5f">
-                            <rect key="frame" x="67" y="48" width="140" height="140"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="140" id="JMA-Gr-W5h"/>
-                                <constraint firstAttribute="height" constant="140" id="bTE-a4-TAO"/>
-                            </constraints>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameEmptyListNor" id="3IP-Mo-Ab2"/>
-                        </imageView>
                         <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2fO-qA-Ys3">
                             <rect key="frame" x="91" y="32" width="92" height="16"/>
                             <textFieldCell key="cell" title="Multiline Label" id="S3f-OA-K2O">
@@ -46,18 +39,41 @@
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                         </textField>
+                        <box boxType="custom" borderWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="aZk-BO-dft" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                            <rect key="frame" x="67" y="48" width="140" height="140"/>
+                            <view key="contentView" id="b2K-9Q-f7v">
+                                <rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <subviews>
+                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Q2N-Tf-H5f">
+                                        <rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
+                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameEmptyListNor" id="3IP-Mo-Ab2"/>
+                                    </imageView>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="Q2N-Tf-H5f" secondAttribute="trailing" id="BAc-vC-f8z"/>
+                                    <constraint firstItem="Q2N-Tf-H5f" firstAttribute="leading" secondItem="b2K-9Q-f7v" secondAttribute="leading" id="XCS-qc-7ua"/>
+                                    <constraint firstItem="Q2N-Tf-H5f" firstAttribute="top" secondItem="b2K-9Q-f7v" secondAttribute="top" id="gyc-hb-rBw"/>
+                                    <constraint firstAttribute="bottom" secondItem="Q2N-Tf-H5f" secondAttribute="bottom" id="sv1-0x-7Lw"/>
+                                </constraints>
+                            </view>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="140" id="0KB-Ct-17w"/>
+                                <constraint firstAttribute="width" constant="140" id="eSm-G9-FHT"/>
+                            </constraints>
+                        </box>
                     </subviews>
                     <constraints>
                         <constraint firstAttribute="width" constant="275" id="1nX-kl-LGA"/>
-                        <constraint firstItem="Q2N-Tf-H5f" firstAttribute="centerX" secondItem="VlN-ah-v0N" secondAttribute="centerX" id="6qD-Ci-PB8"/>
+                        <constraint firstItem="aZk-BO-dft" firstAttribute="top" secondItem="VlN-ah-v0N" secondAttribute="top" id="5dc-f3-IUl"/>
                         <constraint firstAttribute="bottom" secondItem="5Oj-UO-Lu1" secondAttribute="bottom" constant="8" id="Av7-oi-q7O"/>
-                        <constraint firstItem="2fO-qA-Ys3" firstAttribute="top" secondItem="Q2N-Tf-H5f" secondAttribute="bottom" id="E53-Ab-hG7"/>
                         <constraint firstItem="5Oj-UO-Lu1" firstAttribute="top" secondItem="2fO-qA-Ys3" secondAttribute="bottom" constant="8" id="XLy-wr-E3U"/>
-                        <constraint firstItem="Q2N-Tf-H5f" firstAttribute="top" secondItem="VlN-ah-v0N" secondAttribute="top" id="avG-5M-qBC"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="5Oj-UO-Lu1" secondAttribute="trailing" id="dfr-gS-ogu"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="2fO-qA-Ys3" secondAttribute="trailing" id="dui-G5-IQa"/>
                         <constraint firstItem="2fO-qA-Ys3" firstAttribute="centerX" secondItem="VlN-ah-v0N" secondAttribute="centerX" id="heE-V7-yq2"/>
                         <constraint firstItem="5Oj-UO-Lu1" firstAttribute="centerX" secondItem="VlN-ah-v0N" secondAttribute="centerX" id="ixj-o8-d8U"/>
+                        <constraint firstItem="2fO-qA-Ys3" firstAttribute="top" secondItem="aZk-BO-dft" secondAttribute="bottom" id="lAd-gj-wO7"/>
+                        <constraint firstItem="aZk-BO-dft" firstAttribute="centerX" secondItem="VlN-ah-v0N" secondAttribute="centerX" id="oXH-RB-dfT"/>
                     </constraints>
                 </customView>
             </subviews>

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeTableViewCell.swift

@@ -96,8 +96,9 @@ class KMMergeTableViewCell: NSTableCellView {
     
     @IBAction func removeButtonAction(_ sender: Any) {
         guard let callBack = removeAction else { return }
+        guard let fileModel = fileModel else { return }
         
-        callBack(self, fileModel!)
+        callBack(self, fileModel)
     }
     
     @IBAction func comboBoxAction(_ sender: Any) {

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeTableViewCell.xib

@@ -20,7 +20,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe">
+        <customView identifier="KMMergeTableViewCell" id="c22-O7-iKe">
             <rect key="frame" x="0.0" y="0.0" width="446" height="120"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeView.swift

@@ -77,6 +77,10 @@ class KMMergeView: KMBaseXibView {
         blankView.dragAction = { [unowned self] view, filePaths in
             self.addFilePaths(urls: filePaths)
         }
+        
+        blankView.mouseDownAction = { [unowned self] view in
+            self.addFilesAction?(self)
+        }
     }
     
     override func updateLanguage() {
@@ -136,15 +140,18 @@ extension KMMergeView: NSTableViewDataSource {
     }
     
     func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
-        if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier("KMMergeTableViewCell"), owner: nil) as? KMMergeTableViewCell {
-            // 配置单元格的显示内容
-            cell.removeAction = { [unowned self] view, model in
-                self.files.removeObject(model)
-                self.reloadData()
-            }
-            return cell
+        var cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier("KMMergeTableViewCell"), owner: self)
+        if cell == nil {
+            cell = KMMergeTableViewCell.init(frame: CGRectZero)
         }
-        return nil
+        let myCellView: KMMergeTableViewCell = cell! as! KMMergeTableViewCell
+        // 配置单元格的显示内容
+        myCellView.removeAction = { [unowned self] view, model in
+            self.files.removeObject(model)
+            self.reloadData()
+        }
+        return myCellView
+        
     }
     
     func tableView(_ tableView: NSTableView, shouldSelect tableColumn: NSTableColumn?) -> Bool {

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeView.xib

@@ -27,7 +27,7 @@
                 <outlet property="pageSizeWidthHeightConnectorTextField" destination="jxI-cc-QWo" id="ljy-Bg-AYS"/>
                 <outlet property="pageSizeWidthTextField" destination="LOP-cY-2ku" id="IJK-o2-7ED"/>
                 <outlet property="progress" destination="JRN-gC-udx" id="seC-mN-Irw"/>
-                <outlet property="tableview" destination="d4B-48-iZk" id="0x8-U7-Ze3"/>
+                <outlet property="tableview" destination="hSd-xd-6WS" id="ZMC-tX-Tm2"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
@@ -42,162 +42,41 @@
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="etf-2M-YwD">
                             <rect key="frame" x="40" y="60" width="480" height="489"/>
                             <subviews>
-                                <scrollView autohidesScrollers="YES" horizontalLineScroll="122" horizontalPageScroll="10" verticalLineScroll="122" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eYV-Ln-Tgq">
+                                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="60" horizontalPageScroll="10" verticalLineScroll="60" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EWX-cc-X5u">
                                     <rect key="frame" x="0.0" y="0.0" width="480" height="489"/>
-                                    <clipView key="contentView" drawsBackground="NO" id="fdS-X3-PXq">
-                                        <rect key="frame" x="1" y="1" width="478" height="487"/>
+                                    <clipView key="contentView" drawsBackground="NO" id="Kx1-Yj-S3W">
+                                        <rect key="frame" x="0.0" y="0.0" width="480" height="489"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="120" rowSizeStyle="automatic" viewBased="YES" id="d4B-48-iZk">
-                                                <rect key="frame" x="0.0" y="0.0" width="478" height="487"/>
+                                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="60" translatesAutoresizingMaskIntoConstraints="NO" id="hSd-xd-6WS">
+                                                <rect key="frame" x="0.0" y="0.0" width="480" height="489"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                <size key="intercellSpacing" width="3" height="2"/>
-                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                                <size key="intercellSpacing" width="17" height="0.0"/>
+                                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <color key="gridColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <tableColumns>
-                                                    <tableColumn width="437" minWidth="40" maxWidth="1000" id="dga-d9-687">
+                                                    <tableColumn width="448" minWidth="10" maxWidth="3.4028234663852886e+38" id="pXw-Iw-CqQ">
                                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                            <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         </tableHeaderCell>
-                                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="Bj0-sY-WDp">
+                                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="jgu-RX-V82">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                                        <prototypeCellViews>
-                                                            <tableCellView identifier="KMPDFEditAppendTableViewCell" id="bhc-Hf-yRs" customClass="KMPDFEditAppendTabelViewCell">
-                                                                <rect key="frame" x="1" y="1" width="446" height="120"/>
-                                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                                <subviews>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="18n-B7-Ehq">
-                                                                        <rect key="frame" x="18" y="52" width="24" height="16"/>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="width" constant="20" id="LOl-NZ-P6Q"/>
-                                                                        </constraints>
-                                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1" id="byt-R7-QPg">
-                                                                            <font key="font" metaFont="system"/>
-                                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                                        </textFieldCell>
-                                                                    </textField>
-                                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="l0n-eu-47s">
-                                                                        <rect key="frame" x="50" y="10" width="80" height="90"/>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="width" constant="80" id="F6S-kN-MRJ"/>
-                                                                        </constraints>
-                                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSAdvanced" id="l3M-0v-eLI"/>
-                                                                    </imageView>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ACf-CS-Xpd">
-                                                                        <rect key="frame" x="138" y="84" width="85" height="16"/>
-                                                                        <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="FileName.pdf" id="pmk-yr-l33">
-                                                                            <font key="font" metaFont="system"/>
-                                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                                        </textFieldCell>
-                                                                    </textField>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ivJ-ys-dOI">
-                                                                        <rect key="frame" x="138" y="64" width="39" height="16"/>
-                                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="2.0M" id="0Ne-nM-EKu">
-                                                                            <font key="font" metaFont="system"/>
-                                                                            <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
-                                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                                        </textFieldCell>
-                                                                    </textField>
-                                                                    <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nU9-gz-yGh">
-                                                                        <rect key="frame" x="139" y="11" width="290" height="23"/>
-                                                                        <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="XNC-4K-Thw">
-                                                                            <font key="font" metaFont="system"/>
-                                                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                                            <objectValues>
-                                                                                <string>Item 1</string>
-                                                                                <string>Item 2</string>
-                                                                                <string>Item 3</string>
-                                                                            </objectValues>
-                                                                        </comboBoxCell>
-                                                                    </comboBox>
-                                                                    <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="9Pe-yK-bLm">
-                                                                        <rect key="frame" x="0.0" y="-2" width="446" height="5"/>
-                                                                    </box>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nra-7f-8Uv">
-                                                                        <rect key="frame" x="203" y="64" width="61" height="16"/>
-                                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="23 Pages" id="u84-yp-hSW">
-                                                                            <font key="font" metaFont="system"/>
-                                                                            <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
-                                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                                        </textFieldCell>
-                                                                    </textField>
-                                                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="J8n-FN-xPl">
-                                                                        <rect key="frame" x="418" y="84" width="16" height="16"/>
-                                                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameUXIconBtnCloseNor" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="qpq-Gv-fWa">
-                                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                            <font key="font" metaFont="system"/>
-                                                                        </buttonCell>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="height" constant="16" id="NGS-t9-lpK"/>
-                                                                            <constraint firstAttribute="width" constant="16" id="SvZ-XI-bm8"/>
-                                                                        </constraints>
-                                                                        <connections>
-                                                                            <action selector="buttonClicked_Remove:" target="bhc-Hf-yRs" id="e1H-Zl-TCR"/>
-                                                                        </connections>
-                                                                    </button>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="06C-Pf-miX">
-                                                                        <rect key="frame" x="138" y="38" width="77" height="16"/>
-                                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Page Range" id="Q2U-nx-Jyr">
-                                                                            <font key="font" metaFont="system"/>
-                                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                                        </textFieldCell>
-                                                                    </textField>
-                                                                </subviews>
-                                                                <constraints>
-                                                                    <constraint firstAttribute="trailing" secondItem="J8n-FN-xPl" secondAttribute="trailing" constant="12" id="3fO-n7-NY4"/>
-                                                                    <constraint firstItem="J8n-FN-xPl" firstAttribute="centerY" secondItem="ACf-CS-Xpd" secondAttribute="centerY" id="61Y-Qr-MhU"/>
-                                                                    <constraint firstAttribute="trailing" secondItem="9Pe-yK-bLm" secondAttribute="trailing" id="91I-YL-dul"/>
-                                                                    <constraint firstItem="l0n-eu-47s" firstAttribute="leading" secondItem="18n-B7-Ehq" secondAttribute="trailing" constant="10" id="92p-hP-43e"/>
-                                                                    <constraint firstItem="nU9-gz-yGh" firstAttribute="top" secondItem="06C-Pf-miX" secondAttribute="bottom" constant="5" id="AIG-uj-IJ7"/>
-                                                                    <constraint firstItem="18n-B7-Ehq" firstAttribute="leading" secondItem="bhc-Hf-yRs" secondAttribute="leading" constant="20" id="AMH-Wr-2yX"/>
-                                                                    <constraint firstItem="06C-Pf-miX" firstAttribute="top" secondItem="ivJ-ys-dOI" secondAttribute="bottom" constant="10" id="GcO-UI-KCF"/>
-                                                                    <constraint firstItem="ACf-CS-Xpd" firstAttribute="top" secondItem="l0n-eu-47s" secondAttribute="top" id="Kgh-xi-i2k"/>
-                                                                    <constraint firstItem="ivJ-ys-dOI" firstAttribute="top" secondItem="ACf-CS-Xpd" secondAttribute="bottom" constant="4" id="Lem-Bx-RTk"/>
-                                                                    <constraint firstItem="06C-Pf-miX" firstAttribute="leading" secondItem="ACf-CS-Xpd" secondAttribute="leading" id="Lf2-cc-5Wh"/>
-                                                                    <constraint firstItem="ACf-CS-Xpd" firstAttribute="leading" secondItem="l0n-eu-47s" secondAttribute="trailing" constant="10" id="Nkm-p4-agD"/>
-                                                                    <constraint firstItem="18n-B7-Ehq" firstAttribute="centerY" secondItem="bhc-Hf-yRs" secondAttribute="centerY" id="X7T-D9-tW2"/>
-                                                                    <constraint firstItem="nU9-gz-yGh" firstAttribute="leading" secondItem="06C-Pf-miX" secondAttribute="leading" id="XVD-ew-6sE"/>
-                                                                    <constraint firstItem="l0n-eu-47s" firstAttribute="top" secondItem="bhc-Hf-yRs" secondAttribute="top" constant="20" id="bsU-tM-eoZ"/>
-                                                                    <constraint firstAttribute="trailing" secondItem="nU9-gz-yGh" secondAttribute="trailing" constant="20" id="cPI-DO-R5s"/>
-                                                                    <constraint firstAttribute="bottom" secondItem="9Pe-yK-bLm" secondAttribute="bottom" id="dWa-tW-wq8"/>
-                                                                    <constraint firstItem="9Pe-yK-bLm" firstAttribute="leading" secondItem="bhc-Hf-yRs" secondAttribute="leading" id="ebw-dl-cHR"/>
-                                                                    <constraint firstItem="06C-Pf-miX" firstAttribute="leading" secondItem="ivJ-ys-dOI" secondAttribute="leading" id="gkc-0p-QNf"/>
-                                                                    <constraint firstItem="J8n-FN-xPl" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ACf-CS-Xpd" secondAttribute="trailing" priority="999" id="h7i-ea-Ygh"/>
-                                                                    <constraint firstItem="nra-7f-8Uv" firstAttribute="centerY" secondItem="ivJ-ys-dOI" secondAttribute="centerY" id="nhM-W5-28V"/>
-                                                                    <constraint firstItem="nra-7f-8Uv" firstAttribute="leading" secondItem="ivJ-ys-dOI" secondAttribute="trailing" constant="30" id="ql4-xN-HdZ"/>
-                                                                    <constraint firstAttribute="bottom" secondItem="l0n-eu-47s" secondAttribute="bottom" constant="10" id="uKv-yw-3jH"/>
-                                                                </constraints>
-                                                                <connections>
-                                                                    <outlet property="fileImage" destination="l0n-eu-47s" id="FXu-Dd-uTR"/>
-                                                                    <outlet property="fileNameLabel" destination="ACf-CS-Xpd" id="vII-va-GDT"/>
-                                                                    <outlet property="indexLabel" destination="18n-B7-Ehq" id="sUZ-42-k5o"/>
-                                                                    <outlet property="pageCountLabel" destination="nra-7f-8Uv" id="aMH-qc-Xxi"/>
-                                                                    <outlet property="pageRangeBox" destination="nU9-gz-yGh" id="9zC-Ha-8pY"/>
-                                                                    <outlet property="pageRangeLabel" destination="06C-Pf-miX" id="68q-le-9P3"/>
-                                                                    <outlet property="sizeLabel" destination="ivJ-ys-dOI" id="upz-yy-agn"/>
-                                                                </connections>
-                                                            </tableCellView>
-                                                        </prototypeCellViews>
                                                     </tableColumn>
                                                 </tableColumns>
                                             </tableView>
                                         </subviews>
                                         <nil key="backgroundColor"/>
                                     </clipView>
-                                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="boY-om-kXK">
-                                        <rect key="frame" x="1" y="428" width="478" height="16"/>
+                                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="1ke-nn-DeN">
+                                        <rect key="frame" x="1" y="119" width="223" height="15"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                     </scroller>
-                                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Pzk-Sm-zzH">
+                                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="HpQ-2Y-xBG">
                                         <rect key="frame" x="224" y="17" width="15" height="102"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                     </scroller>
@@ -207,13 +86,13 @@
                                 </customView>
                             </subviews>
                             <constraints>
+                                <constraint firstItem="EWX-cc-X5u" firstAttribute="top" secondItem="etf-2M-YwD" secondAttribute="top" id="0Sq-8c-Wbs"/>
+                                <constraint firstItem="EWX-cc-X5u" firstAttribute="leading" secondItem="etf-2M-YwD" secondAttribute="leading" id="3wH-2Z-saz"/>
                                 <constraint firstItem="Fxn-3r-IMx" firstAttribute="leading" secondItem="etf-2M-YwD" secondAttribute="leading" id="462-eC-IZR"/>
                                 <constraint firstAttribute="bottom" secondItem="Fxn-3r-IMx" secondAttribute="bottom" id="7n8-te-h0T"/>
-                                <constraint firstAttribute="bottom" secondItem="eYV-Ln-Tgq" secondAttribute="bottom" id="OML-Gh-PIc"/>
-                                <constraint firstAttribute="trailing" secondItem="eYV-Ln-Tgq" secondAttribute="trailing" id="XcO-0l-P1G"/>
-                                <constraint firstItem="eYV-Ln-Tgq" firstAttribute="leading" secondItem="etf-2M-YwD" secondAttribute="leading" id="Y0C-Av-2v6"/>
+                                <constraint firstAttribute="trailing" secondItem="EWX-cc-X5u" secondAttribute="trailing" id="SxM-Mg-dEq"/>
+                                <constraint firstAttribute="bottom" secondItem="EWX-cc-X5u" secondAttribute="bottom" id="agX-Vh-teZ"/>
                                 <constraint firstAttribute="trailing" secondItem="Fxn-3r-IMx" secondAttribute="trailing" id="j07-9h-QVR"/>
-                                <constraint firstItem="eYV-Ln-Tgq" firstAttribute="top" secondItem="etf-2M-YwD" secondAttribute="top" id="rBf-za-qEC"/>
                                 <constraint firstItem="Fxn-3r-IMx" firstAttribute="top" secondItem="etf-2M-YwD" secondAttribute="top" id="sey-M1-w8v"/>
                             </constraints>
                         </customView>
@@ -438,6 +317,7 @@ Gw
                         <constraint firstItem="etf-2M-YwD" firstAttribute="leading" secondItem="cQr-7a-Ku6" secondAttribute="leading" constant="40" id="hcL-jR-MD6"/>
                         <constraint firstItem="X5t-Fx-Keb" firstAttribute="top" secondItem="cQr-7a-Ku6" secondAttribute="top" constant="19" id="klg-v9-IaR"/>
                         <constraint firstAttribute="bottom" secondItem="rUx-Co-JBd" secondAttribute="bottom" constant="20" id="krO-Fx-g4M"/>
+                        <constraint firstItem="KWE-mW-EZE" firstAttribute="leading" secondItem="cQr-7a-Ku6" secondAttribute="leading" constant="534" id="mLr-Eb-5f7"/>
                         <constraint firstItem="ahD-Bb-hxy" firstAttribute="leading" secondItem="KWE-mW-EZE" secondAttribute="leading" id="ubL-5o-hNx"/>
                         <constraint firstAttribute="bottom" secondItem="Y1C-RH-Mno" secondAttribute="bottom" constant="20" id="vCB-ZS-x5n"/>
                     </constraints>
@@ -453,8 +333,6 @@ Gw
         </customView>
     </objects>
     <resources>
-        <image name="KMImageNameUXIconBtnCloseNor" width="16" height="16"/>
-        <image name="NSAdvanced" width="32" height="32"/>
         <namedColor name="KM_242424_Color40">
             <color red="0.14100000262260437" green="0.14100000262260437" blue="0.14100000262260437" alpha="0.40000000596046448" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>