Quellcode durchsuchen

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

tangchao vor 1 Jahr
Ursprung
Commit
0f4ee419b6

+ 18 - 0
PDF Office/PDF Office.xcodeproj/project.pbxproj

@@ -88,6 +88,12 @@
 		894A00F52976314C0070ED83 /* KMPDFViewPanelSetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 894A00F12976314C0070ED83 /* KMPDFViewPanelSetViewController.xib */; };
 		894A00F62976314C0070ED83 /* KMPDFViewPanelSetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 894A00F12976314C0070ED83 /* KMPDFViewPanelSetViewController.xib */; };
 		894A00F72976314C0070ED83 /* KMPDFViewPanelSetViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 894A00F12976314C0070ED83 /* KMPDFViewPanelSetViewController.xib */; };
+		896933D029AEED520055327F /* SKTextFieldSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 896933CF29AEED510055327F /* SKTextFieldSheetController.m */; };
+		896933D129AEED520055327F /* SKTextFieldSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 896933CF29AEED510055327F /* SKTextFieldSheetController.m */; };
+		896933D229AEED520055327F /* SKTextFieldSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 896933CF29AEED510055327F /* SKTextFieldSheetController.m */; };
+		896933D429AEEE3D0055327F /* PageSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 896933D329AEEE3D0055327F /* PageSheet.xib */; };
+		896933D529AEEE3D0055327F /* PageSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 896933D329AEEE3D0055327F /* PageSheet.xib */; };
+		896933D629AEEE3D0055327F /* PageSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 896933D329AEEE3D0055327F /* PageSheet.xib */; };
 		896DD4552985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896DD4532985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift */; };
 		896DD4562985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896DD4532985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift */; };
 		896DD4572985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896DD4532985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift */; };
@@ -3047,6 +3053,9 @@
 		8942F816292B678100389627 /* KMAnnotationTableCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAnnotationTableCellView.swift; sourceTree = "<group>"; };
 		894A00F02976314C0070ED83 /* KMPDFViewPanelSetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFViewPanelSetViewController.swift; sourceTree = "<group>"; };
 		894A00F12976314C0070ED83 /* KMPDFViewPanelSetViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMPDFViewPanelSetViewController.xib; sourceTree = "<group>"; };
+		896933CE29AEED510055327F /* SKTextFieldSheetController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKTextFieldSheetController.h; sourceTree = "<group>"; };
+		896933CF29AEED510055327F /* SKTextFieldSheetController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKTextFieldSheetController.m; sourceTree = "<group>"; };
+		896933D329AEEE3D0055327F /* PageSheet.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PageSheet.xib; sourceTree = "<group>"; };
 		896DD4532985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPageDisplayThemeCollectionViewItem.swift; sourceTree = "<group>"; };
 		896DD4542985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMPageDisplayThemeCollectionViewItem.xib; sourceTree = "<group>"; };
 		896DD46529893B9800ADE514 /* KMSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSplitView.h; sourceTree = "<group>"; };
@@ -5239,6 +5248,9 @@
 				9FDD0F6A294AD12C000C4DAD /* KMMainViewController+UI.swift */,
 				9FDD0F6E294AD13C000C4DAD /* KMMainViewController+Action.swift */,
 				BBE0BDF229A22EF300440583 /* KMMainViewController+MenuAction.swift */,
+				896933CE29AEED510055327F /* SKTextFieldSheetController.h */,
+				896933CF29AEED510055327F /* SKTextFieldSheetController.m */,
+				896933D329AEEE3D0055327F /* PageSheet.xib */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -8191,6 +8203,7 @@
 				9FF94F0C29A62B5000B1EF69 /* KMDesignSelect.xib in Resources */,
 				ADCB98DD2924775B00B51A03 /* KMBatchProcessingOrderTableCell.xib in Resources */,
 				BB49ED11293F462E00C82CA2 /* KMConvertImageWindowController.xib in Resources */,
+				896933D429AEEE3D0055327F /* PageSheet.xib in Resources */,
 				ADB1FE35297008F400ED072D /* KMBatchCollectionView.xib in Resources */,
 				9FBC48BB299B44C600CA39D7 /* KMSecondaryViewController.xib in Resources */,
 				9FBA0EF128FFC716001117AF /* KMHomeFastToolViewController.xib in Resources */,
@@ -8682,6 +8695,7 @@
 				9F0CB5462986953A00007028 /* KMURLToPDFWindowController.xib in Resources */,
 				9F8539E8294712D600DF644E /* KMChromiumTabContents.xib in Resources */,
 				9F8539CF29430BF300DF644E /* KMBrowserWindowController.xib in Resources */,
+				896933D529AEEE3D0055327F /* PageSheet.xib in Resources */,
 				BBA2109529ACC10F00E6B346 /* signlist_add.pdf in Resources */,
 				9FBA0F0229015A82001117AF /* KMFastToolCollectionViewItem.xib in Resources */,
 				BBFE6E712930D9C600142C01 /* KMMergeSettingWindowController.xib in Resources */,
@@ -8835,6 +8849,7 @@
 				BB4EEF3229763EE7003A3537 /* KMRedactBaseWindowController.xib in Resources */,
 				9F853A0A2947137500DF644E /* newtab.pdf in Resources */,
 				8997011328F40842009AF911 /* KMOutlineViewController.xib in Resources */,
+				896933D629AEEE3D0055327F /* PageSheet.xib in Resources */,
 				BBAFC8412985194800D0648E /* KMPDFEditAppendWindow.xib in Resources */,
 				BBA19F3829ADACC5001A285A /* signPicture_nor.pdf in Resources */,
 				ADB1FE8429752F3200ED072D /* KMBatchSecurityView.xib in Resources */,
@@ -9102,6 +9117,7 @@
 				89E93EDE2999DA6D00F10F66 /* KMNoteFilterCollevtionViewItem.m in Sources */,
 				BB8F4586295B19AC0037EA22 /* KMHeaderFooterDateInfoView.swift in Sources */,
 				ADF9ED2F29A8507400C4A943 /* KMAccountInfoView.swift in Sources */,
+				896933D029AEED520055327F /* SKTextFieldSheetController.m in Sources */,
 				F3B69895298B7F7500E0EB4D /* KMDocumentAIManager.m in Sources */,
 				ADB1FE8629752F4C00ED072D /* KMBatchWatermarkView.swift in Sources */,
 				F3B7DF9A2948565000333201 /* CPDFListHoverAnnotationViewController.m in Sources */,
@@ -9808,6 +9824,7 @@
 				89E93EDF2999DA6D00F10F66 /* KMNoteFilterCollevtionViewItem.m in Sources */,
 				BB8F4587295B19AC0037EA22 /* KMHeaderFooterDateInfoView.swift in Sources */,
 				ADF9ED3029A8507400C4A943 /* KMAccountInfoView.swift in Sources */,
+				896933D129AEED520055327F /* SKTextFieldSheetController.m in Sources */,
 				F3B69896298B7F7500E0EB4D /* KMDocumentAIManager.m in Sources */,
 				ADB1FE8729752F4C00ED072D /* KMBatchWatermarkView.swift in Sources */,
 				ADCB98C62924730000B51A03 /* KMBatchProcessingTableViewModel.swift in Sources */,
@@ -11006,6 +11023,7 @@
 				BBC347FF295448DE008D2CD1 /* KMWatermarkTemplateModel.swift in Sources */,
 				89752DA12936EC50003FF08E /* KMToolbar.m in Sources */,
 				9F1FE4F229406E4700E952CA /* BackgroundGradientView.m in Sources */,
+				896933D229AEED520055327F /* SKTextFieldSheetController.m in Sources */,
 				89752DBF2936FAD0003FF08E /* NSWindow+PopOver.m in Sources */,
 				89316824296D73CC0073EA59 /* KMSignatureAnnotationViewController.m in Sources */,
 				ADC075EC2987A38C006C752F /* KMBatchConverPDFCSVView.swift in Sources */,

+ 17 - 7
PDF Office/PDF Office/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift

@@ -344,31 +344,41 @@ extension KMMainViewController {
 
 extension KMMainViewController {
     @IBAction func menuItemAction_nextPage(_ sender: Any) {
-
+        self.listView.goToNextPage(nil)
     }
     
     @IBAction func menuItemAction_forwardPage(_ sender: Any) {
-
+        self.listView.goToPreviousPage(nil)
     }
     
     @IBAction func menuItemAction_firstPage(_ sender: Any) {
-
+        self.listView.go(toPageIndex: 0, animated: false)
     }
     
     @IBAction func menuItemAction_lastPage(_ sender: Any) {
-
+        self.listView.go(toPageIndex: Int(self.listView.document.pageCount)-1, animated: false)
     }
     
     @IBAction func menuItemAction_forward(_ sender: Any) {
-
+        self.listView.goForward(nil)
     }
     
     @IBAction func menuItemAction_goback(_ sender: Any) {
-
+        self.listView.goBack(nil)
     }
     
     @IBAction func menuItemAction_gotoPage(_ sender: Any) {
-
+        let sheet = SKTextFieldSheetController.init(windowNibName: "PageSheet")
+        var pages : [String] = []
+        for i in 0 ..< self.listView.document.pageCount {
+            pages.append("\(i)")
+        }
+        sheet.callback =  { stingValue in
+            self.listView.go(toPageIndex: Int(sheet.stringValue)!, animated: true)
+        }
+        sheet.showWindow(nil)
+        sheet.pageBox.addItems(withObjectValues: pages)
+        sheet.stringValue = "\(self.listView.currentPageIndex)"
     }
 }
 

+ 4 - 1
PDF Office/PDF Office/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift

@@ -84,7 +84,10 @@ extension KMMainViewController {
                 self.leftSideViewController.panelSetViewController.reloadListViewModel()
             }
         }
-        self.listView.backgroundColor = KMPreferenceManager.shared.displayBackgroundNormalColor
+        if info.keys.contains(KMDisplayBackgroundNormalColorKey) || notification.name.rawValue == "pdfViewDocumentDidLoaded" {
+            self.listView.backgroundColor = KMPreferenceManager.shared.displayBackgroundNormalColor
+            self.listView.layoutDocumentView()
+        }
         self.updatePageIndicatoreType()
     }
     

+ 80 - 0
PDF Office/PDF Office/Class/PDFWindowController/ViewController/PageSheet.xib

@@ -0,0 +1,80 @@
+<?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">
+    <dependencies>
+        <deployment version="1070" 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="SKTextFieldSheetController">
+            <connections>
+                <outlet property="cancelButton" destination="42" id="jBr-SZ-blj"/>
+                <outlet property="okButton" destination="41" id="s37-U2-eAE"/>
+                <outlet property="pageBox" destination="40" id="TRk-hJ-4Lk"/>
+                <outlet property="pageLabel" destination="39" id="uKg-Ud-SKt"/>
+                <outlet property="window" destination="37" id="43"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="37" userLabel="Window" customClass="NSPanel">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="416" y="377" width="192" height="107"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <view key="contentView" id="38">
+                <rect key="frame" x="0.0" y="0.0" width="192" height="107"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="39">
+                        <rect key="frame" x="17" y="69" width="38" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Page:" id="49">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" tag="1" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="41">
+                        <rect key="frame" x="96" y="12" width="82" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" tag="1" inset="2" id="51">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="okAction:" target="-2" id="bIN-ey-RaB"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="42">
+                        <rect key="frame" x="14" y="12" width="82" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="52">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="okAction:" target="-2" id="1nO-nc-C0Z"/>
+                        </connections>
+                    </button>
+                    <comboBox verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="40">
+                        <rect key="frame" x="60" y="65" width="115" height="26"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="50">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </comboBoxCell>
+                    </comboBox>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="141" y="123"/>
+        </window>
+    </objects>
+</document>

+ 52 - 0
PDF Office/PDF Office/Class/PDFWindowController/ViewController/SKTextFieldSheetController.h

@@ -0,0 +1,52 @@
+//
+//  SKTextFieldSheetController.h
+//  Skim
+//
+//  Created by Christiaan Hofman on 9/29/08.
+/*
+ This software is Copyright (c) 2008-2018
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+@interface SKTextFieldSheetController : NSWindowController
+
+@property (nonatomic, retain) IBOutlet NSTextField *textField;
+@property (weak) IBOutlet NSButton *okButton;
+@property (weak) IBOutlet NSButton *cancelButton;
+@property (weak) IBOutlet NSComboBox *pageBox;
+@property (weak) IBOutlet NSTextField *pageLabel;
+
+@property (nonatomic, retain) NSString *stringValue;
+@property (nonatomic,copy) void (^callback)(NSString* stringVaule);
+
+@end

+ 68 - 0
PDF Office/PDF Office/Class/PDFWindowController/ViewController/SKTextFieldSheetController.m

@@ -0,0 +1,68 @@
+//
+//  SKTextFieldSheetController.m
+//  Skim
+//
+//  Created by Christiaan Hofman on 9/29/08.
+/*
+ This software is Copyright (c) 2008-2018
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SKTextFieldSheetController.h"
+
+@implementation SKTextFieldSheetController
+
+
+- (void)windowDidLoad {
+    self.pageLabel.stringValue = NSLocalizedString(@"Page:", nil);
+}
+
+- (NSString *)stringValue {
+    return [[self pageBox] stringValue];
+}
+
+- (void)setStringValue:(NSString *)string {
+    [[self pageBox] setStringValue:string];
+}
+
+- (IBAction)okAction:(id)sender {
+    if(self.callback && sender == self.okButton) {
+        self.callback(self.stringValue);
+    }
+    if (@available(macOS 10.13, *)) {
+        [NSApp endSheet:[self window] returnCode:[sender tag]];
+    } else {
+        [NSApp endSheet:[self window]];
+    }
+    [[self window] orderOut:self];
+}
+
+@end

+ 5 - 0
PDF Office/PDF Office/Class/Preference/Window/KMPreferenceWindowController.swift

@@ -38,6 +38,11 @@ class KMPreferenceWindowController: NSWindowController {
         self.adjectWindowSize(NSSize(width: 512, height: 565+30-96), false)
     }
     
+    override func showWindow(_ sender: Any?) {
+        super.showWindow(sender)
+        self.currentController?.refreshUI()
+    }
+    
     override func windowDidLoad() {
         super.windowDidLoad()
         self.window?.title = NSLocalizedString("Preferences", comment: "")

+ 3 - 3
PDF Office/PDF Office/Class/Preference/Window/KMPreferenceWindowController.xib

@@ -1,8 +1,8 @@
 <?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>
@@ -24,7 +24,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="480" height="270"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
                 <autoresizingMask key="autoresizingMask"/>

+ 1 - 0
PDF Office/PDF Office/PDF Office DMG-Bridging-Header.h

@@ -46,3 +46,4 @@
 
 #import "CStringConstants.h"
 #import "NSUserDefaults+PDFListView.h"
+#import "SKTextFieldSheetController.h"

+ 1 - 0
PDF Office/PDF Office/PDF Office Pro-Bridging-Header.h

@@ -46,3 +46,4 @@
 
 #import "CStringConstants.h"
 #import "NSUserDefaults+PDFListView.h"
+#import "SKTextFieldSheetController.h"

+ 1 - 0
PDF Office/PDF Office/PDF Office-Bridging-Header.h

@@ -66,3 +66,4 @@
 
 #import "KMCellEmptyView.h"
 #import "KMSelfSignAnnotation.h"
+#import "SKTextFieldSheetController.h"