skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Build updates for OS X.

Browse Source
This commit is contained in:
Maarten Billemont 2012-05-13 10:24:19 +02:00
parent 1f68a4cb09
commit 94818bb242
9 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
External/Pearl vendored

@ -1 +1 @@
Subproject commit bbb92ad1957b17d50aaa44e124fb5bacef05da10
Subproject commit 08540e3945ff52d6cdc6f1cb3aca06d195df90fa

3
MasterPassword-Mac.xcodeproj/project.pbxproj
View File

@ -6206,6 +6206,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MasterPassword/Mac/MasterPassword-Prefix.pch";
INFOPLIST_FILE = "MasterPassword/Mac/MasterPassword-Info.plist";
PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO;
};
name = Debug;
@ -6214,7 +6215,7 @@
isa = XCBuildConfiguration;
buildSettings = {
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_PREFIX_HEADER = "MasterPassword/Mac/MasterPassword-Prefix.pch";
INFOPLIST_FILE = "MasterPassword/Mac/MasterPassword-Info.plist";

4
MasterPassword/MPAppDelegate_Shared.h
View File

@ -6,7 +6,11 @@
// Copyright (c) 2011 Lyndir. All rights reserved.
//
#if TARGET_OS_IPHONE
@interface MPAppDelegate_Shared : PearlAppDelegate
#else
@interface MPAppDelegate_Shared : NSObject <PearlConfigDelegate>
#endif
@property (strong, nonatomic) NSData *key;
@property (strong, nonatomic) NSData *keyID;

1
MasterPassword/MPAppDelegate_Store.m
View File

@ -8,6 +8,7 @@
#import "MPAppDelegate_Store.h"
#import "MPElementEntity.h"
#import "MPConfig.h"
@implementation MPAppDelegate_Shared (Store)

1
MasterPassword/MPTypes.m
View File

@ -9,7 +9,6 @@
#import "MPTypes.h"
#import "MPElementGeneratedEntity.h"
#import "MPElementStoredEntity.h"
#include <endian.h>
#define MP_salt nil

18
MasterPassword/Mac/MPAppDelegate.h
View File

@ -7,17 +7,21 @@
//
#import <Cocoa/Cocoa.h>
#import "MPAppDelegate_Shared.h"
#import "MPPasswordWindowController.h"
@interface MPAppDelegate : NSObject <NSApplicationDelegate, PearlConfigDelegate>
@interface MPAppDelegate : MPAppDelegate_Shared <NSApplicationDelegate>
@property (strong) NSStatusItem *statusItem;
@property (weak) IBOutlet NSMenuItem *lockItem;
@property (weak) IBOutlet NSMenuItem *showItem;
@property (strong) IBOutlet NSMenu *statusMenu;
@property (weak) IBOutlet NSMenuItem *useICloudItem;
@property (weak) IBOutlet NSMenuItem *rememberPasswordItem;
@property (weak) IBOutlet NSMenuItem *savePasswordItem;
@property (strong) MPPasswordWindowController *passwordWindow;
@property (weak) IBOutlet NSMenuItem *lockItem;
@property (weak) IBOutlet NSMenuItem *showItem;
@property (strong) IBOutlet NSMenu *statusMenu;
@property (weak) IBOutlet NSMenuItem *useICloudItem;
@property (weak) IBOutlet NSMenuItem *rememberPasswordItem;
@property (weak) IBOutlet NSMenuItem *savePasswordItem;
+ (MPAppDelegate *)get;
- (IBAction)activate:(id)sender;
- (IBAction)togglePreference:(NSMenuItem *)sender;

15
MasterPassword/Mac/MPAppDelegate.m
View File

@ -6,18 +6,14 @@
// 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 "MPElementEntity.h"
#import <Carbon/Carbon.h>
@interface MPAppDelegate ()
@property (readwrite, strong, nonatomic) MPPasswordWindowController *passwordWindow;
@end
@implementation MPAppDelegate
@synthesize statusItem;
@synthesize lockItem;
@ -43,6 +39,11 @@ static EventHotKeyID MPShowHotKey = { .signature = 'show', .id = 1 };
#endif
}
+ (MPAppDelegate *)get {
return (MPAppDelegate *)[super get];
}
static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEvent, void *userData){
// Extract the hotkey ID.

4
MasterPassword/Mac/MPPasswordWindowController.m
View File

@ -7,7 +7,9 @@
//
#import "MPPasswordWindowController.h"
#import "MPAppDelegate_Shared.h"
#import "MPAppDelegate.h"
#import "MPAppDelegate_Key.h"
#import "MPAppDelegate_Store.h"
#import "MPElementEntity.h"
#import "MPElementGeneratedEntity.h"

1
MasterPassword/iOS/MPMainViewController.m
View File

@ -436,7 +436,6 @@
} cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil
otherTitles:
[self isHelpVisible]? @"Hide Help": @"Show Help", @"FAQ", @"Tutorial", @"Settings", @"Export",
#ifdef ADHOC
@"Feedback",
#endif