Build updates for OS X.
This commit is contained in:
parent
1f68a4cb09
commit
94818bb242
2
External/Pearl
vendored
2
External/Pearl
vendored
@ -1 +1 @@
|
|||||||
Subproject commit bbb92ad1957b17d50aaa44e124fb5bacef05da10
|
Subproject commit 08540e3945ff52d6cdc6f1cb3aca06d195df90fa
|
@ -6206,6 +6206,7 @@
|
|||||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||||
GCC_PREFIX_HEADER = "MasterPassword/Mac/MasterPassword-Prefix.pch";
|
GCC_PREFIX_HEADER = "MasterPassword/Mac/MasterPassword-Prefix.pch";
|
||||||
INFOPLIST_FILE = "MasterPassword/Mac/MasterPassword-Info.plist";
|
INFOPLIST_FILE = "MasterPassword/Mac/MasterPassword-Info.plist";
|
||||||
|
PROVISIONING_PROFILE = "";
|
||||||
SKIP_INSTALL = NO;
|
SKIP_INSTALL = NO;
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
@ -6214,7 +6215,7 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
CODE_SIGN_ENTITLEMENTS = MasterPassword/MasterPassword.entitlements;
|
CODE_SIGN_ENTITLEMENTS = MasterPassword/MasterPassword.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
|
CODE_SIGN_IDENTITY = "Mac Developer";
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||||
GCC_PREFIX_HEADER = "MasterPassword/Mac/MasterPassword-Prefix.pch";
|
GCC_PREFIX_HEADER = "MasterPassword/Mac/MasterPassword-Prefix.pch";
|
||||||
INFOPLIST_FILE = "MasterPassword/Mac/MasterPassword-Info.plist";
|
INFOPLIST_FILE = "MasterPassword/Mac/MasterPassword-Info.plist";
|
||||||
|
@ -6,7 +6,11 @@
|
|||||||
// Copyright (c) 2011 Lyndir. All rights reserved.
|
// Copyright (c) 2011 Lyndir. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#if TARGET_OS_IPHONE
|
||||||
@interface MPAppDelegate_Shared : PearlAppDelegate
|
@interface MPAppDelegate_Shared : PearlAppDelegate
|
||||||
|
#else
|
||||||
|
@interface MPAppDelegate_Shared : NSObject <PearlConfigDelegate>
|
||||||
|
#endif
|
||||||
|
|
||||||
@property (strong, nonatomic) NSData *key;
|
@property (strong, nonatomic) NSData *key;
|
||||||
@property (strong, nonatomic) NSData *keyID;
|
@property (strong, nonatomic) NSData *keyID;
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
#import "MPAppDelegate_Store.h"
|
#import "MPAppDelegate_Store.h"
|
||||||
#import "MPElementEntity.h"
|
#import "MPElementEntity.h"
|
||||||
|
#import "MPConfig.h"
|
||||||
|
|
||||||
@implementation MPAppDelegate_Shared (Store)
|
@implementation MPAppDelegate_Shared (Store)
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
#import "MPTypes.h"
|
#import "MPTypes.h"
|
||||||
#import "MPElementGeneratedEntity.h"
|
#import "MPElementGeneratedEntity.h"
|
||||||
#import "MPElementStoredEntity.h"
|
#import "MPElementStoredEntity.h"
|
||||||
#include <endian.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define MP_salt nil
|
#define MP_salt nil
|
||||||
|
@ -7,17 +7,21 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
|
#import "MPAppDelegate_Shared.h"
|
||||||
#import "MPPasswordWindowController.h"
|
#import "MPPasswordWindowController.h"
|
||||||
|
|
||||||
@interface MPAppDelegate : NSObject <NSApplicationDelegate, PearlConfigDelegate>
|
@interface MPAppDelegate : MPAppDelegate_Shared <NSApplicationDelegate>
|
||||||
|
|
||||||
@property (strong) NSStatusItem *statusItem;
|
@property (strong) NSStatusItem *statusItem;
|
||||||
@property (weak) IBOutlet NSMenuItem *lockItem;
|
@property (strong) MPPasswordWindowController *passwordWindow;
|
||||||
@property (weak) IBOutlet NSMenuItem *showItem;
|
@property (weak) IBOutlet NSMenuItem *lockItem;
|
||||||
@property (strong) IBOutlet NSMenu *statusMenu;
|
@property (weak) IBOutlet NSMenuItem *showItem;
|
||||||
@property (weak) IBOutlet NSMenuItem *useICloudItem;
|
@property (strong) IBOutlet NSMenu *statusMenu;
|
||||||
@property (weak) IBOutlet NSMenuItem *rememberPasswordItem;
|
@property (weak) IBOutlet NSMenuItem *useICloudItem;
|
||||||
@property (weak) IBOutlet NSMenuItem *savePasswordItem;
|
@property (weak) IBOutlet NSMenuItem *rememberPasswordItem;
|
||||||
|
@property (weak) IBOutlet NSMenuItem *savePasswordItem;
|
||||||
|
|
||||||
|
+ (MPAppDelegate *)get;
|
||||||
|
|
||||||
- (IBAction)activate:(id)sender;
|
- (IBAction)activate:(id)sender;
|
||||||
- (IBAction)togglePreference:(NSMenuItem *)sender;
|
- (IBAction)togglePreference:(NSMenuItem *)sender;
|
||||||
|
@ -6,18 +6,14 @@
|
|||||||
// Copyright (c) 2012 Lyndir. All rights reserved.
|
// Copyright (c) 2012 Lyndir. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
#import "MPAppDelegate_Shared.h"
|
#import "MPAppDelegate.h"
|
||||||
|
#import "MPAppDelegate_Key.h"
|
||||||
|
#import "MPAppDelegate_Store.h"
|
||||||
#import "MPConfig.h"
|
#import "MPConfig.h"
|
||||||
#import "MPElementEntity.h"
|
#import "MPElementEntity.h"
|
||||||
#import <Carbon/Carbon.h>
|
#import <Carbon/Carbon.h>
|
||||||
|
|
||||||
|
|
||||||
@interface MPAppDelegate ()
|
|
||||||
|
|
||||||
@property (readwrite, strong, nonatomic) MPPasswordWindowController *passwordWindow;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
@implementation MPAppDelegate
|
@implementation MPAppDelegate
|
||||||
@synthesize statusItem;
|
@synthesize statusItem;
|
||||||
@synthesize lockItem;
|
@synthesize lockItem;
|
||||||
@ -43,6 +39,11 @@ static EventHotKeyID MPShowHotKey = { .signature = 'show', .id = 1 };
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ (MPAppDelegate *)get {
|
||||||
|
|
||||||
|
return (MPAppDelegate *)[super get];
|
||||||
|
}
|
||||||
|
|
||||||
static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEvent, void *userData){
|
static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEvent, void *userData){
|
||||||
|
|
||||||
// Extract the hotkey ID.
|
// Extract the hotkey ID.
|
||||||
|
@ -7,7 +7,9 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#import "MPPasswordWindowController.h"
|
#import "MPPasswordWindowController.h"
|
||||||
#import "MPAppDelegate_Shared.h"
|
#import "MPAppDelegate.h"
|
||||||
|
#import "MPAppDelegate_Key.h"
|
||||||
|
#import "MPAppDelegate_Store.h"
|
||||||
#import "MPElementEntity.h"
|
#import "MPElementEntity.h"
|
||||||
#import "MPElementGeneratedEntity.h"
|
#import "MPElementGeneratedEntity.h"
|
||||||
|
|
||||||
|
@ -436,7 +436,6 @@
|
|||||||
} cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil
|
} cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil
|
||||||
otherTitles:
|
otherTitles:
|
||||||
[self isHelpVisible]? @"Hide Help": @"Show Help", @"FAQ", @"Tutorial", @"Settings", @"Export",
|
[self isHelpVisible]? @"Hide Help": @"Show Help", @"FAQ", @"Tutorial", @"Settings", @"Export",
|
||||||
|
|
||||||
#ifdef ADHOC
|
#ifdef ADHOC
|
||||||
@"Feedback",
|
@"Feedback",
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user