【Page Edit】页面停留在页面编辑中，后台运行中，突然闪退，附闪退报告(已修复)

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -199,9 +199,6 @@
 		8997012228F41AB8009AF911 /* KMLeftSideViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8997011E28F41AB8009AF911 /* KMLeftSideViewController.xib */; };
 		8997012328F41AB8009AF911 /* KMLeftSideViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8997011E28F41AB8009AF911 /* KMLeftSideViewController.xib */; };
 		8997012428F41AB8009AF911 /* KMLeftSideViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8997011E28F41AB8009AF911 /* KMLeftSideViewController.xib */; };
-		8997012E28F42F15009AF911 /* Biochemistry.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 8997012D28F42F15009AF911 /* Biochemistry.pdf */; };
-		8997012F28F42F15009AF911 /* Biochemistry.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 8997012D28F42F15009AF911 /* Biochemistry.pdf */; };
-		8997013028F42F15009AF911 /* Biochemistry.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 8997012D28F42F15009AF911 /* Biochemistry.pdf */; };
 		899E0B092919244500B13D34 /* KMCustomTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899E0B082919244500B13D34 /* KMCustomTableRowView.swift */; };
 		899E0B0A2919244500B13D34 /* KMCustomTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899E0B082919244500B13D34 /* KMCustomTableRowView.swift */; };
 		899E0B0B2919244500B13D34 /* KMCustomTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899E0B082919244500B13D34 /* KMCustomTableRowView.swift */; };
@@ -3423,7 +3420,6 @@
 		8997011528F40898009AF911 /* KMThumbnailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMThumbnailViewController.xib; sourceTree = "<group>"; };
 		8997011D28F41AB8009AF911 /* KMLeftSideViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLeftSideViewController.swift; sourceTree = "<group>"; };
 		8997011E28F41AB8009AF911 /* KMLeftSideViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLeftSideViewController.xib; sourceTree = "<group>"; };
-		8997012D28F42F15009AF911 /* Biochemistry.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Biochemistry.pdf; sourceTree = "<group>"; };
 		899E0B082919244500B13D34 /* KMCustomTableRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCustomTableRowView.swift; sourceTree = "<group>"; };
 		89D2D2B42947316800BFF5FE /* Quick Start Guide_Widget_Widget.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Quick Start Guide_Widget_Widget.pdf"; sourceTree = "<group>"; };
 		89D2D2B52947316800BFF5FE /* Quick Start Guide_Widget.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Quick Start Guide_Widget.pdf"; sourceTree = "<group>"; };
@@ -4999,7 +4995,6 @@
 				BB1AEF3429F937A50048D179 /* PDF Master User Guide.pdf */,
 				89D2D2B42947316800BFF5FE /* Quick Start Guide_Widget_Widget.pdf */,
 				89D2D2B52947316800BFF5FE /* Quick Start Guide_Widget.pdf */,
-				8997012D28F42F15009AF911 /* Biochemistry.pdf */,
 				8942F7B12921D28200389627 /* Quick Start Guide.pdf */,
 				899700E628F3E4D3009AF911 /* MainWindowController.swift */,
 				899700E728F3E4D3009AF911 /* MainWindowController.xib */,
@@ -9262,7 +9257,6 @@
 				9FD0FA3429CD947000F2AB0D /* KMOpacityPanel.xib in Resources */,
 				BB4BD9CF2909026500A66A65 /* KMRightSideViewController.xib in Resources */,
 				BB99ACC5292DE22E0048AFD9 /* KMMergeViewController.xib in Resources */,
-				8997012E28F42F15009AF911 /* Biochemistry.pdf in Resources */,
 				ADB1FEA22975303F00ED072D /* KMBatchBatesNumberView.xib in Resources */,
 				8942F7F32926087200389627 /* KMSearchViewController.xib in Resources */,
 				ADF9ED3329A850D200C4A943 /* KMAccountInfoView.xib in Resources */,
@@ -9571,7 +9565,6 @@
 				ADB1FEAB2975310A00ED072D /* KMBatchRemoveView.xib in Resources */,
 				9FBC48BC299B44C600CA39D7 /* KMSecondaryViewController.xib in Resources */,
 				9F94747C29FA22700042F949 /* InfoPlist.strings in Resources */,
-				8997012F28F42F15009AF911 /* Biochemistry.pdf in Resources */,
 				AD2D74B129F0CEB300EDC5E4 /* KMCancellationWindowController.xib in Resources */,
 				9F1FE4DF29406E4700E952CA /* .gclient in Resources */,
 				BB69C960299116FD0001A9B1 /* plaid.pdf in Resources */,
@@ -9935,7 +9928,6 @@
 				BB5F8A1E29BB15AD00365ADB /* KMEmailSubWindowController.xib in Resources */,
 				AD867FB929DFBB3200F00440 /* KMAnnotationOutlineCellView.xib in Resources */,
 				ADF1569E29A63CBF001D1018 /* KMLightMember.xcassets in Resources */,
-				8997013028F42F15009AF911 /* Biochemistry.pdf in Resources */,
 				9F8539DC294318D600DF644E /* TabsImage.xcassets in Resources */,
 				BBC745EF295F067B0072C2ED /* KMCropSettingWindowController.xib in Resources */,
 				BBAFC84F298519F700D0648E /* KMSavePanelAccessoryController.xib in Resources */,

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -676,21 +676,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "FF5A2760-E653-4DBB-8403-D304EB24D0F0"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/ChromiumTabs/KMBrowser.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "34"
-            endingLineNumber = "34"
-            landmarkName = "closeTabViewItem()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

PDF Office/PDF Master/Class/Home/ViewController/KMCloudEmptyCollectionViewItem.xib

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMCloudEmptyCollectionViewItem" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMCloudEmptyCollectionViewItem" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="cloudImageView" destination="ir1-0I-yOK" id="oAD-Go-xDI"/>
                 <outlet property="cloudLabel" destination="efb-UO-oeN" id="ttW-Cb-ehx"/>
@@ -24,7 +23,7 @@
                     <constraints>
                         <constraint firstAttribute="height" constant="172" id="krG-eD-iAd"/>
                     </constraints>
-                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Biochemistry" id="rOO-sR-L7F"/>
+                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="rOO-sR-L7F"/>
                 </imageView>
                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Mbu-ra-vyQ">
                     <rect key="frame" x="0.0" y="0.0" width="612" height="52"/>
@@ -60,7 +59,4 @@
             <point key="canvasLocation" x="139" y="154"/>
         </customView>
     </objects>
-    <resources>
-        <image name="Biochemistry" width="612" height="783"/>
-    </resources>
 </document>

PDF Office/PDF Master/Class/Home/ViewController/KMHistoryFileCollectionViewItem.xib

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMHistoryFileCollectionViewItem" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMHistoryFileCollectionViewItem" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="documentName" destination="lue-CR-EiO" id="Kut-UF-epU"/>
                 <outlet property="favoriteButton" destination="aI1-x1-Rrt" id="K8z-lG-qKM"/>
@@ -22,7 +21,7 @@
             <rect key="frame" x="0.0" y="0.0" width="228" height="272"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="04S-7L-aR3" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="04S-7L-aR3" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                     <rect key="frame" x="0.0" y="0.0" width="228" height="272"/>
                     <view key="contentView" id="Y6Z-am-nWp">
                         <rect key="frame" x="0.0" y="0.0" width="228" height="272"/>
@@ -36,7 +35,7 @@
                                     <subviews>
                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4zi-8a-CaK">
                                             <rect key="frame" x="0.0" y="0.0" width="228" height="180"/>
-                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Biochemistry" id="oqA-44-cDA"/>
+                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="oqA-44-cDA"/>
                                         </imageView>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aI1-x1-Rrt">
                                             <rect key="frame" x="203" y="155" width="16" height="22"/>
@@ -99,7 +98,6 @@
         </customView>
     </objects>
     <resources>
-        <image name="Biochemistry" width="612" height="783"/>
-        <image name="NSActionTemplate" width="20" height="20"/>
+        <image name="NSActionTemplate" width="15" height="15"/>
     </resources>
 </document>

PDF Office/PDF Master/Class/Home/ViewController/KMHomeHistoryFileViewController.xib

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMHomeHistoryFileViewController" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMHomeHistoryFileViewController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="deleteBox" destination="aXB-IV-e8R" id="8Md-O9-YwP"/>
                 <outlet property="deleteBoxHeight" destination="7ky-J5-8lA" id="xpI-5A-eHj"/>
@@ -82,7 +81,7 @@
                                                 <action selector="openFileAction:" target="-2" id="uIl-VG-PWa"/>
                                             </connections>
                                         </button>
-                                        <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Voy-Qh-tgb" customClass="KMMoveBox" customModule="PDF_Office" customModuleProvider="target">
+                                        <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Voy-Qh-tgb" customClass="KMMoveBox" customModule="PDF_Master" customModuleProvider="target">
                                             <rect key="frame" x="267" y="42" width="128" height="128"/>
                                             <view key="contentView" id="buu-8f-Cls">
                                                 <rect key="frame" x="0.0" y="0.0" width="128" height="128"/>
@@ -156,7 +155,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="68" height="32"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="NfR-vN-YbT" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="NfR-vN-YbT" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                                 <rect key="frame" x="2" y="2" width="32" height="24"/>
                                 <view key="contentView" id="mHq-Mu-dvJ">
                                     <rect key="frame" x="0.0" y="0.0" width="32" height="24"/>
@@ -179,7 +178,7 @@
                                     <constraint firstAttribute="width" constant="32" id="npY-Rc-XqP"/>
                                 </constraints>
                             </box>
-                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="SHU-Sa-IG4" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="SHU-Sa-IG4" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                                 <rect key="frame" x="34" y="2" width="32" height="24"/>
                                 <view key="contentView" id="6xk-lb-lfB">
                                     <rect key="frame" x="0.0" y="0.0" width="32" height="24"/>
@@ -218,7 +217,7 @@
                         <constraint firstAttribute="height" constant="32" id="WBT-Kl-uEp"/>
                     </constraints>
                 </box>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="aXB-IV-e8R" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="aXB-IV-e8R" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                     <rect key="frame" x="597" y="386" width="32" height="32"/>
                     <view key="contentView" id="7eF-HT-fMp">
                         <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
@@ -241,7 +240,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="597" height="372"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <collectionView selectable="YES" id="41G-Wi-2zc" customClass="KMHistoryFileCollectionView" customModule="PDF_Office" customModuleProvider="target">
+                                        <collectionView selectable="YES" id="41G-Wi-2zc" customClass="KMHistoryFileCollectionView" customModule="PDF_Master" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="597" height="372"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                             <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="TAv-4C-W1m">
@@ -260,7 +259,7 @@
                                     <rect key="frame" x="-100" y="-100" width="233" height="15"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
-                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="OmZ-np-EHK" customClass="KMToolSetScroller" customModule="PDF_Office" customModuleProvider="target">
+                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="OmZ-np-EHK" customClass="KMToolSetScroller" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="234" y="1" width="15" height="143"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
@@ -271,7 +270,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="597" height="372"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" selectionHighlightStyle="none" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="76" rowSizeStyle="automatic" viewBased="YES" id="KnG-9K-0sJ" customClass="KMHistoryFileTableView" customModule="PDF_Office" customModuleProvider="target">
+                                        <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" selectionHighlightStyle="none" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="76" rowSizeStyle="automatic" viewBased="YES" id="KnG-9K-0sJ" customClass="KMHistoryFileTableView" customModule="PDF_Master" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="597" height="372"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -289,11 +288,11 @@
                                                     </textFieldCell>
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
-                                                        <tableCellView id="kZK-Bs-0PF" customClass="KMHomeHistoryFileTableviewCell" customModule="PDF_Office" customModuleProvider="target">
+                                                        <tableCellView id="kZK-Bs-0PF" customClass="KMHomeHistoryFileTableviewCell" customModule="PDF_Master" customModuleProvider="target">
                                                             <rect key="frame" x="0.0" y="0.0" width="597" height="76"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="g02-xk-jpk" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                                                                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="g02-xk-jpk" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                                                                     <rect key="frame" x="0.0" y="0.0" width="597" height="76"/>
                                                                     <view key="contentView" id="ZlB-5n-pSb">
                                                                         <rect key="frame" x="0.0" y="0.0" width="597" height="76"/>
@@ -305,7 +304,7 @@
                                                                                     <constraint firstAttribute="width" constant="60" id="KuS-pX-HFd"/>
                                                                                     <constraint firstAttribute="height" constant="60" id="erN-K9-LBp"/>
                                                                                 </constraints>
-                                                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Biochemistry" id="gl5-8t-bO5"/>
+                                                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="gl5-8t-bO5"/>
                                                                             </imageView>
                                                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="puB-4O-CjH">
                                                                                 <rect key="frame" x="449" y="30" width="110" height="16"/>
@@ -427,7 +426,7 @@
                                     <rect key="frame" x="1" y="356" width="666" height="15"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
-                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Pqc-wg-QGI" customClass="KMToolSetScroller" customModule="PDF_Office" customModuleProvider="target">
+                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Pqc-wg-QGI" customClass="KMToolSetScroller" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="224" y="17" width="15" height="102"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
@@ -466,7 +465,6 @@
         </customView>
     </objects>
     <resources>
-        <image name="Biochemistry" width="612" height="783"/>
         <image name="KMHomeHistoryFileList" width="20" height="20"/>
         <image name="KMHomeHistoryFileThumbnail" width="20" height="20"/>
         <image name="icon_btn_more_false_false" width="16" height="16"/>

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift

@@ -1349,11 +1349,11 @@ extension KMHomeViewController {
     
     @IBAction func importFromScanner(_ sender: Any) {
         deviceBrowserWC = KMDeviceBrowserWindowController.init(windowNibName: "KMDeviceBrowserWindowController")
-        deviceBrowserWC!.type = .scanner
-        deviceBrowserWC!.importScannerFileCallback = { [unowned self](url: NSURL) -> Void in
-            openFile(withFilePath: url as URL)
+        deviceBrowserWC?.type = .scanner
+        deviceBrowserWC?.importScannerFileCallback = { [weak self](url: NSURL) -> Void in
+            self?.openFile(withFilePath: url as URL)
         }
-        deviceBrowserWC!.showWindow(NSApp.mainWindow)
+        deviceBrowserWC?.showWindow(NSApp.mainWindow)
     }
     
     @IBAction func menuItemClick_mergePDF(_ sender: Any) {

PDF Office/PDF Master/Class/Home/WindowController/KMDeviceBrowserWindowController.swift

@@ -23,6 +23,14 @@ class KMDeviceBrowserWindowController: NSWindowController {
     var importCameraFileCallback: ImportCameraFileCallback?
     var importScannerFileCallback: ImportScannerFileCallback?
 
+    deinit {
+        KMPrint("KMDeviceBrowserWindowController 已释放.")
+        
+        self.deviceBrowserView.delegate = nil
+        self.cameraDeviceView.delegate = nil
+        self.scannerDeviceView.delegate = nil
+    }
+    
     override func windowDidLoad() {
         super.windowDidLoad()
         

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMCustomizeStampViewController.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -50,11 +49,11 @@
                 <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="GKG-UM-Zfb">
                     <rect key="frame" x="27" y="237" width="324" height="46"/>
                     <view key="contentView" id="UNf-az-8zB">
-                        <rect key="frame" x="4" y="5" width="316" height="38"/>
+                        <rect key="frame" x="3" y="3" width="318" height="40"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mmA-gH-boM">
-                                <rect key="frame" x="0.0" y="3" width="158" height="35"/>
+                                <rect key="frame" x="0.0" y="3" width="159" height="37"/>
                                 <buttonCell key="cell" type="bevel" title="Text Stamp" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Sha-gH-eRW">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -64,13 +63,13 @@
                                 </connections>
                             </button>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="h7i-TG-AHz">
-                                <rect key="frame" x="0.0" y="0.0" width="158" height="3"/>
+                                <rect key="frame" x="0.0" y="0.0" width="159" height="3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="3" id="2fy-27-I8D"/>
                                 </constraints>
                             </customView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ABE-yw-dWd">
-                                <rect key="frame" x="158" y="3" width="158" height="35"/>
+                                <rect key="frame" x="159" y="3" width="159" height="37"/>
                                 <buttonCell key="cell" type="bevel" title="Image Stamp" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="CXf-6q-PhP">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -99,9 +98,9 @@
                     </constraints>
                 </box>
                 <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="lBO-ea-4YE">
-                    <rect key="frame" x="10" y="58" width="358" height="173"/>
+                    <rect key="frame" x="7" y="54" width="364" height="179"/>
                     <view key="contentView" id="N7Y-Q2-RaB">
-                        <rect key="frame" x="0.0" y="0.0" width="358" height="173"/>
+                        <rect key="frame" x="0.0" y="0.0" width="364" height="179"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     </view>
                     <constraints>
@@ -165,11 +164,11 @@ Gw
                 <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Le4-nu-TzQ">
                     <rect key="frame" x="7" y="71" width="344" height="94"/>
                     <view key="contentView" id="4ZG-Hs-G9z">
-                        <rect key="frame" x="4" y="5" width="336" height="86"/>
+                        <rect key="frame" x="3" y="3" width="338" height="88"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YdI-Zl-i7q">
-                                <rect key="frame" x="0.0" y="37" width="336" height="16"/>
+                                <rect key="frame" x="0.0" y="37" width="338" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="Stamp Text" drawsBackground="YES" id="e8l-Wv-ls8">
                                     <font key="font" usesAppearanceFont="YES"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -177,7 +176,7 @@ Gw
                                 </textFieldCell>
                             </textField>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dKj-JI-wt8">
-                                <rect key="frame" x="0.0" y="24" width="336" height="13"/>
+                                <rect key="frame" x="0.0" y="24" width="338" height="13"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="Stamp Text" drawsBackground="YES" id="AXj-OW-hjJ">
                                     <font key="font" metaFont="system" size="10"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -200,7 +199,7 @@ Gw
                     </constraints>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jao-ve-9UP">
-                    <rect key="frame" x="9" y="44" width="40" height="16"/>
+                    <rect key="frame" x="8" y="44" width="40" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Stype" id="fiz-2U-bZt">
                         <font key="font" usesAppearanceFont="YES"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -208,7 +207,7 @@ Gw
                     </textFieldCell>
                 </textField>
                 <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="jYD-a2-U4T">
-                    <rect key="frame" x="55" y="43" width="18" height="18"/>
+                    <rect key="frame" x="54" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="18" id="Hol-Qp-nn7"/>
                         <constraint firstAttribute="height" constant="18" id="Pri-Le-exp"/>
@@ -222,7 +221,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="tck-dO-dSW">
-                    <rect key="frame" x="81" y="43" width="18" height="18"/>
+                    <rect key="frame" x="80" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="kB0-5R-IUr"/>
                         <constraint firstAttribute="width" constant="18" id="wI4-GT-Kpj"/>
@@ -236,7 +235,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="6ZC-ge-vPv">
-                    <rect key="frame" x="107" y="43" width="18" height="18"/>
+                    <rect key="frame" x="106" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="D2A-cB-Wc6"/>
                         <constraint firstAttribute="width" constant="18" id="e8O-WS-n9w"/>
@@ -250,7 +249,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="KYW-Dy-lC0">
-                    <rect key="frame" x="133" y="43" width="18" height="18"/>
+                    <rect key="frame" x="132" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="CW0-gE-7qt"/>
                         <constraint firstAttribute="width" constant="18" id="iEb-kr-yZI"/>
@@ -264,7 +263,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="pMv-wo-uq1">
-                    <rect key="frame" x="159" y="43" width="18" height="18"/>
+                    <rect key="frame" x="158" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="18" id="gjw-3g-7HE"/>
                         <constraint firstAttribute="height" constant="18" id="yPS-VV-6iA"/>
@@ -278,7 +277,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="6" translatesAutoresizingMaskIntoConstraints="NO" id="ZE8-gp-HVS">
-                    <rect key="frame" x="185" y="43" width="18" height="18"/>
+                    <rect key="frame" x="184" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="0Qs-xh-5ae"/>
                         <constraint firstAttribute="width" constant="18" id="f7L-ko-tbI"/>
@@ -292,7 +291,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="jEA-O9-yI1">
-                    <rect key="frame" x="211" y="43" width="18" height="18"/>
+                    <rect key="frame" x="210" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="dYi-sN-ygR"/>
                         <constraint firstAttribute="width" constant="18" id="m5C-iX-brh"/>
@@ -306,7 +305,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="8" translatesAutoresizingMaskIntoConstraints="NO" id="aKM-vb-hTB">
-                    <rect key="frame" x="237" y="43" width="18" height="18"/>
+                    <rect key="frame" x="236" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="HUT-AK-E1h"/>
                         <constraint firstAttribute="width" constant="18" id="nld-Q6-xrS"/>
@@ -320,7 +319,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="9" translatesAutoresizingMaskIntoConstraints="NO" id="CKW-of-DHj">
-                    <rect key="frame" x="263" y="43" width="18" height="18"/>
+                    <rect key="frame" x="262" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="18" id="AVo-OH-rsc"/>
                         <constraint firstAttribute="height" constant="18" id="tPN-c2-smp"/>
@@ -334,7 +333,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="10" translatesAutoresizingMaskIntoConstraints="NO" id="HAt-8V-MUY">
-                    <rect key="frame" x="289" y="43" width="18" height="18"/>
+                    <rect key="frame" x="288" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="18" id="0hI-oI-fpk"/>
                         <constraint firstAttribute="height" constant="18" id="FHx-HL-Iiw"/>
@@ -348,7 +347,7 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" tag="11" translatesAutoresizingMaskIntoConstraints="NO" id="MeJ-op-Krm">
-                    <rect key="frame" x="315" y="43" width="18" height="18"/>
+                    <rect key="frame" x="314" y="43" width="18" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="Q7Z-2Q-iZJ"/>
                         <constraint firstAttribute="width" constant="18" id="dpO-hq-BoF"/>
@@ -446,7 +445,7 @@ Gw
                         <constraint firstAttribute="height" constant="173" id="aQx-A8-9tS"/>
                         <constraint firstAttribute="width" constant="358" id="xaP-V9-m9v"/>
                     </constraints>
-                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Biochemistry" id="PU7-L6-C4k"/>
+                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="PU7-L6-C4k"/>
                 </imageView>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sYK-tA-a8s">
                     <rect key="frame" x="272" y="136" width="83" height="32"/>
@@ -459,13 +458,13 @@ Gw
                     </connections>
                 </button>
                 <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Azq-FB-w2y">
-                    <rect key="frame" x="94" y="32" width="171" height="110"/>
+                    <rect key="frame" x="91" y="28" width="177" height="116"/>
                     <view key="contentView" id="zvE-ep-MW7">
-                        <rect key="frame" x="0.0" y="0.0" width="171" height="110"/>
+                        <rect key="frame" x="0.0" y="0.0" width="177" height="116"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bww-Hi-1RW">
-                                <rect key="frame" x="75" y="50" width="20" height="20"/>
+                                <rect key="frame" x="78" y="53" width="20" height="20"/>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameMainToolbarUp" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="bkX-sC-n4N">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -475,7 +474,7 @@ Gw
                                 </connections>
                             </button>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZS6-14-hOj">
-                                <rect key="frame" x="67" y="29" width="37" height="16"/>
+                                <rect key="frame" x="70" y="32" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Qmd-br-6tD">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -508,7 +507,6 @@ Gw
         </customView>
     </objects>
     <resources>
-        <image name="Biochemistry" width="612" height="783"/>
         <image name="KMImageNameMainToolbarUp" width="20" height="20"/>
         <image name="KMImageNamePropertybarTextStamp1" width="18" height="18"/>
         <image name="KMImageNamePropertybarTextStamp10" width="18" height="18"/>