Sfoglia il codice sorgente

【偏好设置】StatusBar补充

tangchao 1 anno fa
parent
commit
db9ca1ff2a

+ 2 - 0
PDF Office/PDF Master/AppDelegate.swift

@@ -57,6 +57,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
             
         }
 
+        KMStatusBar.system()
+        
         //        MARK: 广告数据初始化
         KMAdvertisementManager.manager.initConfig(appName: .PDFReaderProMac,
                                                   subscribeType: .unknow,

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateBaseWindowController.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMBatchOperateBaseWindowController: NSWindowController{
+@objcMembers class KMBatchOperateBaseWindowController: NSWindowController{
     var files: [KMBatchOperateFile]?
     var operateType: KMBatchOperationType?{
         willSet{

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateWindowController.swift

@@ -22,7 +22,7 @@ let kBatchOperateToolbar_HeadFooterIdentifier = "kBatchOperateToolbar_HeadFooter
 let kBatchOperateToolbar_BatesIdentifier = "kBatchOperateToolbar_BatesIdentifier"
 
 
-final class KMBatchOperateWindowController: KMBatchOperateBaseWindowController, NSWindowDelegate, KMCustomButtonViewPopDelegate, KMCustomButtonViewPopDataSource, NSToolbarDelegate{
+@objcMembers final class KMBatchOperateWindowController: KMBatchOperateBaseWindowController, NSWindowDelegate, KMCustomButtonViewPopDelegate, KMCustomButtonViewPopDataSource, NSToolbarDelegate{
     func numberOfLine(in button: KMCustomViewButton) -> Int {
         return 2
     }

+ 0 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -1366,7 +1366,6 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
     }
     
     @IBAction func screenShot_SelectArea(_ sender: Any?) {
-        KMPrint("screenShot_SelectArea")
         KMScreenShotHandler.beginScreenshot_SelectRectWithCompleteHandler { ima in
             if let image = ima {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {

+ 21 - 0
PDF Office/PDF Master/Class/Common/OC/StatusBar/KMStatusBar.h

@@ -0,0 +1,21 @@
+//
+//  KMStatusBar.h
+//  PDF Reader Pro Edition
+//
+//  Created by 王帅 on 2018/9/30.
+//
+
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KMStatusBar : NSObject
+
+@property (nonatomic,assign) BOOL isShow;
+
++ (KMStatusBar *)systemStatusBar;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 229 - 0
PDF Office/PDF Master/Class/Common/OC/StatusBar/KMStatusBar.m

@@ -0,0 +1,229 @@
+//
+//  KMStatusBar.m
+//  PDF Reader Pro Edition
+//
+//  Created by 王帅 on 2018/9/30.
+//
+
+#import "KMStatusBar.h"
+#import "IAPProductsManager.h"
+#import <PDF_Reader_Pro-Swift.h>
+
+@interface KMStatusBar ()
+
+@property (nonatomic,retain) NSStatusItem *convertStatusItem;
+
+@property (nonatomic, strong) NSWindowController *windowC;
+
+@end
+
+@implementation KMStatusBar
+
+#pragma mark - Init Methods
+
++ (KMStatusBar *)systemStatusBar {
+    static KMStatusBar *singleton = nil;
+    static dispatch_once_t pred;
+    dispatch_once(&pred, ^{
+        singleton = [[KMStatusBar alloc] init];
+    });
+    return singleton;
+}
+
+- (instancetype)init {
+    if (self = [super init]) {
+        if ([self isShow]) {
+            [self showConvertStatusItem];
+        }
+    }
+    return self;
+}
+
+- (void)dealloc {
+//    [_convertStatusItem release];
+//    [super dealloc];
+}
+
+#pragma mark - Public Methods
+
+- (BOOL)isShow {
+    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"KMStatusBarIsShowKey"]) {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:@"KMStatusBarIsShowKey"];
+    }
+    return YES;
+}
+
+- (void)setIsShow:(BOOL)isShow {
+    [[NSUserDefaults standardUserDefaults] setBool:isShow forKey:@"KMStatusBarIsShowKey"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+    if (isShow) {
+        [self showConvertStatusItem];
+    } else {
+        [self removeConvertStatusItem];
+    }
+}
+
+#pragma mark - Private Methods
+
+- (void)showConvertStatusItem {
+    if (!self.convertStatusItem) {
+        NSMenu *menu = [[NSMenu alloc] init];
+        self.convertStatusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
+        [self.convertStatusItem setImage:[NSImage imageNamed:@"KMImageNameToolbarConvert"]];
+        [self.convertStatusItem setHighlightMode:YES];
+        [self.convertStatusItem setTarget:self];
+        [self.convertStatusItem setMenu:menu];
+
+        NSMenuItem *item = [menu addItemWithTitle:NSLocalizedString(@"PDF to Office", nil) action:@selector(convertItemAction:) keyEquivalent:@""];
+        item.target = self;
+        [menu addItem:[NSMenuItem separatorItem]];
+        
+        item = [menu addItemWithTitle:NSLocalizedString(@"New From Clipboard", nil) action:@selector(newFromClipboardItemAction:) keyEquivalent:@""];
+        item.target = self;
+        item = [menu addItemWithTitle:NSLocalizedString(@"New From Images", nil) action:@selector(newFromImagesItemAction:) keyEquivalent:@""];
+        item.target = self;
+        item = [menu addItemWithTitle:NSLocalizedString(@"New From File", nil) action:@selector(newFromFileItemAction:) keyEquivalent:@""];
+        item.target = self;
+        item = [menu addItemWithTitle:NSLocalizedString(@"New From Web Page", nil) action:@selector(newFromWebPageItemAction:) keyEquivalent:@""];
+        item.target = self;
+        [menu addItem:[NSMenuItem separatorItem]];
+       
+        item = [menu addItemWithTitle:NSLocalizedString(@"Crosshair Screenshot", nil) action:@selector(screenshotFromSelectionItemAction:) keyEquivalent:@""];
+        item.target = self;
+        item = [menu addItemWithTitle:NSLocalizedString(@"Window Screenshot", nil) action:@selector(screenshotFromWindowItemAction:) keyEquivalent:@""];
+        item.target = self;
+        item = [menu addItemWithTitle:NSLocalizedString(@"Fullscreen Screenshot", nil) action:@selector(screenshotFromEntireItemAction:) keyEquivalent:@""];
+        item.target = self;
+        [menu addItem:[NSMenuItem separatorItem]];
+
+        item = [menu addItemWithTitle:NSLocalizedStringFromTable(@"Preferences…", @"MainMenu", nil) action:@selector(preferencesItemAction:) keyEquivalent:@""];
+        item.target = self;
+    }
+}
+
+- (void)removeConvertStatusItem {
+    if (self.convertStatusItem) {
+        [[NSStatusBar systemStatusBar] removeStatusItem:self.convertStatusItem];
+        self.convertStatusItem = nil;
+    }
+}
+
+#pragma mark - Item Action
+
+- (void)convertItemAction:(id)sender {
+    if ([IAPProductsManager defaultManager].isAvailableAllFunction) {
+        NSOpenPanel *openPanel = [NSOpenPanel openPanel];
+        [openPanel setAllowedFileTypes:@[@"pdf",@"PDF"]];
+        [openPanel setAllowsMultipleSelection:NO];
+        [openPanel beginSheetModalForWindow:[NSApp mainWindow] completionHandler:^(NSInteger result) {
+            if (result == NSModalResponseOK) {
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    KMBatchOperateBaseWindowController *baseWindowController = [[KMBatchOperateBaseWindowController alloc] initWithWindowNibName:@"KMBatchOperateBaseWindowController"];
+                    KMBatchOperateFile *file = [[KMBatchOperateFile alloc] initWithFilePath:openPanel.URL.path type:KMBatchOperationTypeConvert];
+                    NSMutableArray *arr = [NSMutableArray array];
+                    [arr addObject:file];
+                    [baseWindowController.window makeKeyAndOrderFront:nil];
+                    [baseWindowController checkNeedPasswordSwitchToOperateTypeWithOperateType:KMBatchOperationTypeConvert files:arr];
+                    [baseWindowController switchToConvertTypeWithConvertType:[IAPProductsManager defaultManager].isAvailableAdvancedPDFToOffice? KMConvertWithPDFTypeWordAdvance:KMConvertWithPDFTypeWordStandard];
+                });
+            }
+        }];
+    } else {
+        NSOpenPanel *openPanel = [NSOpenPanel openPanel];
+        [openPanel setAllowedFileTypes:@[@"pdf"]];
+        openPanel.message = NSLocalizedString(@"To select multiple files press cmd ⌘ button on keyboard and click on the target files one by one.", nil);
+        [openPanel setAllowsMultipleSelection:NO];
+        [openPanel beginSheetModalForWindow:[NSApp mainWindow] completionHandler:^(NSInteger result) {
+            if (result == NSModalResponseOK) {
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    CPDFDocument *document = [[CPDFDocument alloc] initWithURL:openPanel.URL];
+                    KMConvertWindowController *com = [[KMConvertWindowController alloc] initWithDocumemtV:document currentPage:nil convertT:KMConvertTypeWord handle:^{
+                        KMBatchOperateWindowController *batchWindowController = [KMBatchOperateWindowController sharedWindowController];
+                        
+//                        var needShowHint = false
+//                        if KMConvertOperationQueue.sharedQueue.operations.count > 0 {
+//                            needShowHint = true
+//                        } else {
+//                            var needContinue = false
+//                            if KMBatchOperateManager.defaultManager.files?.count ?? 0 > 0 {
+//                                let arr: [String] = converFilesToPath(files: KMBatchOperateManager.defaultManager.files!)
+//                                let ss = self.document?.documentURL.path
+//                                if arr.contains(ss!) {
+//                                    needContinue = false
+//                                }else {
+//                                    needContinue = true
+//                                }
+//                            }else {
+//                                needContinue = true
+//                            }
+//
+//                            if needContinue {
+//                                let ss = self.document?.documentURL.path
+//                                let file = KMBatchOperateFile(filePath: ss!, type: .Convert)
+//                                file.password = document?.password ?? ""
+//                                KMBatchOperateManager.defaultManager.files?.append(file)
+//                            }
+//                            batchWindowController.switchToOperateType(.Convert, files: KMBatchOperateManager.defaultManager.files!)
+//                            batchWindowController.switchToConvertType(convertType: type)
+//                        }
+//
+                        [batchWindowController.window makeKeyAndOrderFront:nil];
+                    }];
+                    com.batchButton.hidden = true;
+//                    [com showWindow:nil];
+                    [[self fetchBrowserWindowC].window beginSheet:com.window completionHandler:^(NSModalResponse returnCode) {
+                                            
+                    }];
+                    self.windowC = com;
+                });
+            }
+        }];
+    }
+}
+
+- (void)newFromClipboardItemAction:(id)sender {
+    [[self fetchBrowserWindowC] newDocumentFromClipboard:sender];
+}
+
+- (void)newFromImagesItemAction:(id)sender {
+    [[self fetchBrowserWindowC] createPDFFromImage];
+}
+
+- (void)newFromFileItemAction:(id)sender {
+    [[self fetchBrowserWindowC] importFromFile:sender];
+}
+
+- (void)newFromWebPageItemAction:(id)sender {
+    [[self fetchBrowserWindowC] importFromWebPage:nil];
+}
+
+- (void)screenshotFromSelectionItemAction:(id)sender {
+    [[self fetchBrowserWindowC] screenShot_SelectArea:nil];
+}
+
+- (void)screenshotFromWindowItemAction:(id)sender {
+    [[self fetchBrowserWindowC] screenShot_Window:nil];
+}
+
+- (void)screenshotFromEntireItemAction:(id)sender {
+    [[self fetchBrowserWindowC] screenShot_FullScreen:nil];
+}
+
+- (void)preferencesItemAction:(id)sender {
+    [[KMPreferenceController shared] showWindow:self];
+}
+
+- (KMBrowserWindowController *)fetchBrowserWindowC {
+    CTBrowserWindow *flagWin = nil;
+    for (NSWindow *win in NSApp.windows) {
+        if ([win isKindOfClass:[CTBrowserWindow class]]) {
+            if (win.isVisible) {
+                flagWin = win;
+                break;
+            }
+        }
+    }
+    return flagWin.windowController;
+}
+
+@end

+ 3 - 5
PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift

@@ -14,7 +14,7 @@ let kPreviewMaxHeight = 325.0
 
 let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("convert.pdf"))
 
-class KMConvertWindowController: NSWindowController, NSTextFieldDelegate, NSWindowDelegate{
+@objcMembers class KMConvertWindowController: NSWindowController, NSTextFieldDelegate, NSWindowDelegate{
     @IBOutlet var prePDFViewHeight: NSLayoutConstraint!
     @IBOutlet var prePDFViewWidth: NSLayoutConstraint!
    
@@ -142,10 +142,8 @@ class KMConvertWindowController: NSWindowController, NSTextFieldDelegate, NSWind
         if (isLoc) {
             self.showWaitting()
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                let com = PasswordWindowController(windowNibName: "PasswordWindowController")
-                com.fileURL = URL(fileURLWithPath: self.pdfDocument!.documentURL.path)
-                NSWindow.currentWindow().km_beginSheet(windowC: com)
-                com.closeCallBack = { password in
+                let url = URL(fileURLWithPath: self.pdfDocument!.documentURL.path)
+                KMBaseWindowController.checkPassword(url: url) { result, password in
                     self.hideWaitting()
                     if password.count > 0 {
                         let unlockSuccess: Bool = ((self.pdfDocument?.unlock(withPassword: password)) != nil)

+ 6 - 6
PDF Office/PDF Master/Class/Preference/Controller/KMGeneralPreferences.swift

@@ -105,7 +105,7 @@ class KMGeneralPreferences: NSViewController {
     override func loadView() {
         super.loadView()
 
-    //    self.showConvertMenuButton.state = [KMStatusBar systemStatusBar].isShow ? NSControlStateValueOn : NSControlStateValueOff;
+        self.showConvertMenuButton.state = KMStatusBar.system().isShow ? .on : .off
         
     #if VERSION_FREE
         if IAPProductsManager.default().isAvailableAllFunction() == false {
@@ -235,11 +235,11 @@ class KMGeneralPreferences: NSViewController {
     }
     
     @IBAction func showConvertMenuButtonAction(_ sender: AnyObject?) {
-//        if ([self.showConvertMenuButton state]) {
-//            //        [KMStatusBar systemStatusBar].isShow = YES;
-//        } else {
-//            //        [KMStatusBar systemStatusBar].isShow = NO;
-//        }
+        if self.showConvertMenuButton.state == .on {
+            KMStatusBar.system().isShow = true
+        } else {
+            KMStatusBar.system().isShow = false
+        }
         KMPreference.shared.showInMenuBar = self.showConvertMenuButton.state == .on
     }
     

+ 1 - 1
PDF Office/PDF Master/Class/Preference/Window/KMPreferenceController.swift

@@ -23,7 +23,7 @@ private let NIBNAME_KEY = "nibName"
     @objc optional func defaultsDidRevert()
 }
 
-class KMPreferenceController: NSWindowController {
+@objcMembers class KMPreferenceController: NSWindowController {
     
     @IBOutlet var resetBtn: NSButton!
     @IBOutlet var resetAllBtn: NSButton!

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

@@ -108,3 +108,4 @@
 #import "AutoSavePopController.h"
 //同步
 #import "synctex_parser.h"
+#import "KMStatusBar.h"

+ 1 - 0
PDF Office/PDF Master/PDF_Reader_Pro Edition-Bridging-Header.h

@@ -104,3 +104,4 @@
 #import "AutoSavePopController.h"
 //同步
 #import "synctex_parser.h"
+#import "KMStatusBar.h"

+ 2 - 0
PDF Office/PDF Master/PDF_Reader_Pro-Bridging-Header.h

@@ -104,3 +104,5 @@
 #import "AutoSavePopController.h"
 //同步
 #import "synctex_parser.h"
+#import "KMStatusBar.h"
+

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

@@ -3204,6 +3204,9 @@
 		BB2F9AB82AFCC3AD00F9DD93 /* KMProfileInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB2F9AB72AFCC3AD00F9DD93 /* KMProfileInfo.swift */; };
 		BB2F9AB92AFCC3AD00F9DD93 /* KMProfileInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB2F9AB72AFCC3AD00F9DD93 /* KMProfileInfo.swift */; };
 		BB2F9ABA2AFCC3AD00F9DD93 /* KMProfileInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB2F9AB72AFCC3AD00F9DD93 /* KMProfileInfo.swift */; };
+		BB30D4822B90249D00702541 /* KMStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = BB30D4802B90249D00702541 /* KMStatusBar.m */; };
+		BB30D4832B90249D00702541 /* KMStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = BB30D4802B90249D00702541 /* KMStatusBar.m */; };
+		BB30D4842B90249D00702541 /* KMStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = BB30D4802B90249D00702541 /* KMStatusBar.m */; };
 		BB3198122AC5142900107371 /* NSMenu+KMExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3198112AC5142900107371 /* NSMenu+KMExtension.swift */; };
 		BB3198132AC5142900107371 /* NSMenu+KMExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3198112AC5142900107371 /* NSMenu+KMExtension.swift */; };
 		BB3198142AC5142900107371 /* NSMenu+KMExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3198112AC5142900107371 /* NSMenu+KMExtension.swift */; };
@@ -6405,6 +6408,8 @@
 		BB2F9AAE2AFCAE1F00F9DD93 /* KMProfileTitleCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMProfileTitleCellView.swift; sourceTree = "<group>"; };
 		BB2F9AB22AFCC2F800F9DD93 /* KMProfileInfoWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMProfileInfoWindowController.swift; sourceTree = "<group>"; };
 		BB2F9AB72AFCC3AD00F9DD93 /* KMProfileInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMProfileInfo.swift; sourceTree = "<group>"; };
+		BB30D4802B90249D00702541 /* KMStatusBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMStatusBar.m; sourceTree = "<group>"; };
+		BB30D4812B90249D00702541 /* KMStatusBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMStatusBar.h; sourceTree = "<group>"; };
 		BB3198112AC5142900107371 /* NSMenu+KMExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMenu+KMExtension.swift"; sourceTree = "<group>"; };
 		BB3198152AC55E6D00107371 /* CPDFDocument+KMExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFDocument+KMExtension.swift"; sourceTree = "<group>"; };
 		BB3198192AC567B500107371 /* CPDFSelection+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFSelection+PDFListView.swift"; sourceTree = "<group>"; };
@@ -11235,6 +11240,15 @@
 			path = Tools;
 			sourceTree = "<group>";
 		};
+		BB30D47F2B90249D00702541 /* StatusBar */ = {
+			isa = PBXGroup;
+			children = (
+				BB30D4802B90249D00702541 /* KMStatusBar.m */,
+				BB30D4812B90249D00702541 /* KMStatusBar.h */,
+			);
+			path = StatusBar;
+			sourceTree = "<group>";
+		};
 		BB328B662B565BEC00B382C6 /* iVersion */ = {
 			isa = PBXGroup;
 			children = (
@@ -11589,6 +11603,7 @@
 		BB5F8A0329BB04EF00365ADB /* OC */ = {
 			isa = PBXGroup;
 			children = (
+				BB30D47F2B90249D00702541 /* StatusBar */,
 				BBD8EE892B8EC86900EB05FE /* AutoSave */,
 				BBBBB49C2B6F743700C7205E /* AttachmentEmailer */,
 				BBBBB4962B6F70B100C7205E /* Common */,
@@ -15426,6 +15441,7 @@
 				899700FE28F40710009AF911 /* KMBookMarkViewController.swift in Sources */,
 				BB2EDF6D296ECE17003BCF58 /* KMPageEditInsertDirectionItemView.swift in Sources */,
 				BB570ADF2B513A66005E7E4A /* KMLeftSideViewController+Snapshot.swift in Sources */,
+				BB30D4822B90249D00702541 /* KMStatusBar.m in Sources */,
 				BBD1F783296F9DB500343885 /* KMPageEditExtractWindowController.swift in Sources */,
 				BB146FB1299DC0D100784A6A /* GTLRErrorObject.m in Sources */,
 				ADAFDA482AEA7F1300F084BC /* KMAdvertisementShowView.swift in Sources */,
@@ -16363,6 +16379,7 @@
 				BB1CA5CC298E5F540059E31C /* KMMergeTools.swift in Sources */,
 				89D9896D28FD50EF003A3E87 /* KMAnnotationCollectionViewItem.swift in Sources */,
 				BB146FDF299DC0D100784A6A /* GTLRDriveObjects.m in Sources */,
+				BB30D4832B90249D00702541 /* KMStatusBar.m in Sources */,
 				9F0CB5122986565700007028 /* KMDesignToken+BorderRadius.swift in Sources */,
 				9F69DBB32B512614003D4C45 /* KMAnnotationTextWidgetOptionsViewController.swift in Sources */,
 				BBF811E12B07178F0074874F /* KMExtractImageWindowController.swift in Sources */,
@@ -18310,6 +18327,7 @@
 				9F080B16298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */,
 				BBFBE74828DD7DB8008B2335 /* AppDelegate.swift in Sources */,
 				AD055EBB2B8843FD0035F824 /* SKToolbarItem.m in Sources */,
+				BB30D4842B90249D00702541 /* KMStatusBar.m in Sources */,
 				BB3A66AD2B078FB200575343 /* KMNoteTableViewCell.swift in Sources */,
 				BB1B0AC12B4FC6E900889528 /* KMGuideInfoWindowController.swift in Sources */,
 				BB853C932AF8DCBF009C20C1 /* KMBatchOperateRemovePasswordViewController.swift in Sources */,

+ 3 - 3
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -46,9 +46,9 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1767"
-            endingLineNumber = "1767"
-            landmarkName = "togglePresentation(_:)"
+            startingLineNumber = "1766"
+            endingLineNumber = "1766"
+            landmarkName = "menuItemAction_annotation(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>