From 737ccf0ade078b2da8a260f075dac431fbc7b920 Mon Sep 17 00:00:00 2001 From: michael starke Date: Tue, 12 Feb 2013 11:12:15 +0100 Subject: [PATCH] Introduced Windowdelegation for Responder Chain handling --- MacPass.xcodeproj/project.pbxproj | 29 +- MacPass/MPDatabaseDocument.h | 3 +- MacPass/MPDatabaseDocument.m | 51 +- MacPass/MPGeneralSettingsController.m | 4 + MacPass/MPMainWindowController.m | 34 +- MacPass/MPMainWindowDelegate.h | 13 + MacPass/MPMainWindowDelegate.m | 25 + MacPass/MPOutlineViewDelegate.m | 2 +- MacPass/MPSettingsTabProtocoll.h | 1 + MacPass/MainWindow.xib | 92 +++- MacPass/PasswordView.xib | 685 ++++++++++++++++++++++++++ MacPass/PasswordWindow.xib | 123 ----- 12 files changed, 878 insertions(+), 184 deletions(-) create mode 100644 MacPass/MPMainWindowDelegate.h create mode 100644 MacPass/MPMainWindowDelegate.m create mode 100644 MacPass/PasswordView.xib delete mode 100644 MacPass/PasswordWindow.xib diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index ca960ea4..be7efa28 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -43,6 +43,7 @@ 4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */; }; 4C669BA116760ED100DD0774 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7916760ED100DD0774 /* Utils.m */; }; 4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; }; + 4C6B0E8C16C9B99B00A9ED23 /* PasswordView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C6B0E8B16C9B99B00A9ED23 /* PasswordView.xib */; }; 4C77E36715B84A240093A587 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; }; 4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E36F15B84A240093A587 /* InfoPlist.strings */; }; 4C77E37315B84A240093A587 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37215B84A240093A587 /* main.m */; }; @@ -50,7 +51,7 @@ 4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37915B84A240093A587 /* MPAppDelegate.m */; }; 4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37B15B84A240093A587 /* MainMenu.xib */; }; 4C83814215BF4677001AE468 /* MPMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPMainWindowController.m */; }; - 4C88763415BABA30003D2CE9 /* PasswordWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C88763315BABA30003D2CE9 /* PasswordWindow.xib */; }; + 4C90D9B416CA4B18003081E7 /* MPMainWindowDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C90D9B316CA4B18003081E7 /* MPMainWindowDelegate.m */; }; 4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; }; 4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */; }; 4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */; }; @@ -143,6 +144,7 @@ 4C669B7916760ED100DD0774 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = ""; }; 4C669B7A16760ED100DD0774 /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = ""; }; 4C669B7B16760ED100DD0774 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = ""; }; + 4C6B0E8B16C9B99B00A9ED23 /* PasswordView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordView.xib; sourceTree = ""; }; 4C77E36215B84A240093A587 /* MacPass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacPass.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4C77E36615B84A240093A587 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 4C77E36915B84A240093A587 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; @@ -158,7 +160,8 @@ 4C77E37C15B84A240093A587 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; 4C83814015BF4677001AE468 /* MPMainWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMainWindowController.h; sourceTree = ""; }; 4C83814115BF4677001AE468 /* MPMainWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMainWindowController.m; sourceTree = ""; }; - 4C88763315BABA30003D2CE9 /* PasswordWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordWindow.xib; sourceTree = ""; }; + 4C90D9B216CA4B18003081E7 /* MPMainWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMainWindowDelegate.h; sourceTree = ""; }; + 4C90D9B316CA4B18003081E7 /* MPMainWindowDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMainWindowDelegate.m; sourceTree = ""; }; 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindow.xib; sourceTree = ""; }; 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GeneralSettings.xib; sourceTree = ""; }; 4CA0B2F715BCAF6700654E32 /* MPGeneralSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPGeneralSettingsController.h; sourceTree = ""; }; @@ -205,10 +208,10 @@ isa = PBXGroup; children = ( 4C77E37B15B84A240093A587 /* MainMenu.xib */, - 4C88763315BABA30003D2CE9 /* PasswordWindow.xib */, 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */, 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */, 4CD884B615BD47080042BBF8 /* MainWindow.xib */, + 4C6B0E8B16C9B99B00A9ED23 /* PasswordView.xib */, ); name = Views; sourceTree = ""; @@ -220,6 +223,8 @@ 4C77E37915B84A240093A587 /* MPAppDelegate.m */, 4CC6258F15BA1C99002F5B11 /* MPOutlineViewDelegate.h */, 4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */, + 4C90D9B216CA4B18003081E7 /* MPMainWindowDelegate.h */, + 4C90D9B316CA4B18003081E7 /* MPMainWindowDelegate.m */, ); name = Delegates; sourceTree = ""; @@ -503,7 +508,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = MP; - LastUpgradeCheck = 0440; + LastUpgradeCheck = 0460; ORGANIZATIONNAME = "HicknHack Software GmbH"; }; buildConfigurationList = 4C77E35C15B84A240093A587 /* Build configuration list for PBXProject "MacPass" */; @@ -513,6 +518,7 @@ knownRegions = ( en, English, + de, ); mainGroup = 4C77E35715B84A240093A587; productRefGroup = 4C77E36315B84A240093A587 /* Products */; @@ -532,10 +538,10 @@ 4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */, 4C77E37715B84A240093A587 /* Credits.rtf in Resources */, 4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */, - 4C88763415BABA30003D2CE9 /* PasswordWindow.xib in Resources */, 4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */, 4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */, 4CD884B715BD47080042BBF8 /* MainWindow.xib in Resources */, + 4C6B0E8C16C9B99B00A9ED23 /* PasswordView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -594,6 +600,7 @@ 4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */, 4C669BA116760ED100DD0774 /* Utils.m in Sources */, 4C669BA216760ED100DD0774 /* UUID.m in Sources */, + 4C90D9B416CA4B18003081E7 /* MPMainWindowDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -633,6 +640,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_ARC = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -652,7 +663,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lxml2"; - SDKROOT = macosx10.7; + SDKROOT = macosx; }; name = Debug; }; @@ -662,6 +673,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_ARC = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -674,7 +689,7 @@ HEADER_SEARCH_PATHS = "/usr/include/libxml2/**"; MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "-lxml2"; - SDKROOT = macosx10.7; + SDKROOT = macosx; }; name = Release; }; diff --git a/MacPass/MPDatabaseDocument.h b/MacPass/MPDatabaseDocument.h index 309fd5c1..697c2afa 100644 --- a/MacPass/MPDatabaseDocument.h +++ b/MacPass/MPDatabaseDocument.h @@ -9,10 +9,11 @@ #import APPKIT_EXTERN NSString *const MPDidLoadDataBaseNotification; +APPKIT_EXTERN NSString *const MPDataBaseDocumentDocumentKey; @interface MPDatabaseDocument : NSObject - (id)initWithFile:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key; -- (void)openFile:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key; +- (BOOL) openFile:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key; @end diff --git a/MacPass/MPDatabaseDocument.m b/MacPass/MPDatabaseDocument.m index f5c93bd8..a8b94658 100644 --- a/MacPass/MPDatabaseDocument.m +++ b/MacPass/MPDatabaseDocument.m @@ -26,34 +26,53 @@ NSString *const MPDidLoadDataBaseNotification = @"DidLoadDataBaseNotification"; { self = [super init]; if (self) { - [self openFile:file password:password keyfile:key]; + BOOL sucess = [self openFile:file password:password keyfile:key]; + // Check if load was successfull and return nil of not + if( NO == sucess ) { + [self release]; + return nil; + } } return self; } -- (void)openFile:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key { +- (BOOL) openFile:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key{ // Try to load the file - KdbPassword *kdbPassword = nil; - if( password != nil ) { - if( key != nil ) { - kdbPassword = [[KdbPassword alloc] initWithPassword:password encoding:NSUTF8StringEncoding keyfile:[key path]]; - } - else { - kdbPassword = [[KdbPassword alloc] initWithPassword:password encoding:NSUTF8StringEncoding]; - } + KdbPassword *dbPassword = nil; + const BOOL hasPassword = (password != nil); + const BOOL hasKeyfile = (key != nil); + + // Create the password for the given parameters + if( hasPassword && hasKeyfile) { + dbPassword = [[KdbPassword alloc] initWithPassword:password encoding:NSUTF8StringEncoding keyfile:[key path]]; + } + else if( hasPassword ) { + dbPassword = [[KdbPassword alloc] initWithPassword:password encoding:NSUTF8StringEncoding]; + } + else if( hasKeyfile ) { + dbPassword = [[KdbPassword alloc] initWithKeyfile:[key path]]; + } + else { + NSLog(@"Error: No password or keyfile given!"); + return NO; } @try { - _tree = [KdbReaderFactory load:[file path] withPassword:kdbPassword]; + self.tree = [KdbReaderFactory load:[file path] withPassword:dbPassword]; } @catch (NSException *exception) { - // ignore + NSLog(@"%@", [exception description]); } - if( _tree != nil) { - // Post notification that a new document was loaded - NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter]; - [defaultCenter postNotificationName:MPDidLoadDataBaseNotification object:self]; + // Cleanup + if( dbPassword != nil ) { + [dbPassword release]; } + + if( self.tree != nil) { + return YES; + } + return NO; + } @end diff --git a/MacPass/MPGeneralSettingsController.m b/MacPass/MPGeneralSettingsController.m index a95319ff..b0a1c9d1 100644 --- a/MacPass/MPGeneralSettingsController.m +++ b/MacPass/MPGeneralSettingsController.m @@ -21,6 +21,10 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab"; return MPGeneralSetingsIdentifier; } ++ (NSImage *)image { + return [NSImage imageNamed:NSImageNamePreferencesGeneral]; +} + - (id)init { return [self initWithNibName:@"GeneralSettings" bundle:[NSBundle mainBundle]]; } diff --git a/MacPass/MPMainWindowController.m b/MacPass/MPMainWindowController.m index a46e2573..d3012ff2 100644 --- a/MacPass/MPMainWindowController.m +++ b/MacPass/MPMainWindowController.m @@ -10,53 +10,51 @@ #import "MPOutlineDataSource.h" #import "MPOutlineViewDelegate.h" #import "MPDatabaseDocument.h" +#import "MPMainWindowDelegate.h" NSString *const kColumnIdentifier = @"OutlineColumn"; NSString *const kOutlineViewIdentifier = @"OutlineView"; @interface MPMainWindowController () + @property (assign) IBOutlet NSOutlineView *outlineView; @property (retain) MPOutlineDataSource *datasource; @property (retain) MPOutlineViewDelegate *outlineDelegate; +@property (retain) MPMainWindowDelegate *windowDelegate; @property (retain) MPDatabaseDocument *database; + - (void)updateData; + @end @implementation MPMainWindowController -(id)init { - return [super initWithWindowNibName:@"MainWindow" owner:self]; + self = [super initWithWindowNibName:@"MainWindow" owner:self]; + if( self ) { + _windowDelegate = [[MPMainWindowDelegate alloc] init]; + _outlineDelegate = [[MPOutlineViewDelegate alloc] init]; + _datasource = [[MPOutlineDataSource alloc] init]; + } + return self; } - (void)windowDidLoad { [super windowDidLoad]; + /* + Setup Connections for Outline View + */ - _outlineDelegate = [[MPOutlineViewDelegate alloc] init]; - _datasource = [[MPOutlineDataSource alloc] init]; + [self.window setDelegate:self.windowDelegate]; [[_outlineView outlineTableColumn] setIdentifier:kColumnIdentifier]; [_outlineView setDelegate:_outlineDelegate]; - [_outlineView setDataSource:_datasource]; - // register for sucessfull document loads - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateData) name:MPDidLoadDataBaseNotification object:_database]; } - (void)updateData { [_outlineView reloadData]; } -- (void)newDocument:(id)sender { - NSLog(@"New"); -} - -- (void)performClose:(id)sender { - NSLog(@"Close"); -} - -- (void)openDocument:(id)sender { - NSLog(@"OpenDocument"); -} - @end diff --git a/MacPass/MPMainWindowDelegate.h b/MacPass/MPMainWindowDelegate.h new file mode 100644 index 00000000..554f61ed --- /dev/null +++ b/MacPass/MPMainWindowDelegate.h @@ -0,0 +1,13 @@ +// +// MPMainWindowDelegate.h +// MacPass +// +// Created by michael starke on 12.02.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import + +@interface MPMainWindowDelegate : NSObject + +@end diff --git a/MacPass/MPMainWindowDelegate.m b/MacPass/MPMainWindowDelegate.m new file mode 100644 index 00000000..de77be0c --- /dev/null +++ b/MacPass/MPMainWindowDelegate.m @@ -0,0 +1,25 @@ +// +// MPMainWindowDelegate.m +// MacPass +// +// Created by michael starke on 12.02.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import "MPMainWindowDelegate.h" + +@implementation MPMainWindowDelegate + +- (void)newDocument:(id)sender { + NSLog(@"New"); +} + +- (void)performClose:(id)sender { + NSLog(@"Close"); +} + +- (void)openDocument:(id)sender { + NSLog(@"New Document"); +} + +@end diff --git a/MacPass/MPOutlineViewDelegate.m b/MacPass/MPOutlineViewDelegate.m index 2db8ccb9..73b8874c 100644 --- a/MacPass/MPOutlineViewDelegate.m +++ b/MacPass/MPOutlineViewDelegate.m @@ -11,7 +11,7 @@ @implementation MPOutlineViewDelegate - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item { - NSTableCellView *view = [outlineView makeViewWithIdentifier:@"OutlineCell" owner:self]; + NSTableCellView *view = [outlineView makeViewWithIdentifier:@"DataCell" owner:self]; [view.imageView setImage:[NSImage imageNamed:NSImageNameFolder]]; [view.textField setStringValue:@"Test"]; return view; diff --git a/MacPass/MPSettingsTabProtocoll.h b/MacPass/MPSettingsTabProtocoll.h index 3779765f..41333a92 100644 --- a/MacPass/MPSettingsTabProtocoll.h +++ b/MacPass/MPSettingsTabProtocoll.h @@ -12,5 +12,6 @@ @required + (NSString *)identifier; ++ (NSImage *)image; @end diff --git a/MacPass/MainWindow.xib b/MacPass/MainWindow.xib index 1b222e1c..0ec4bb7e 100644 --- a/MacPass/MainWindow.xib +++ b/MacPass/MainWindow.xib @@ -3,12 +3,12 @@ 1080 12C60 - 2844 + 3084 1187.34 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2844 + 3084 IBNSLayoutConstraint @@ -49,7 +49,7 @@ 15 2 - {{196, 240}, {780, 701}} + {{196, 240}, {825, 599}} 544735232 Window NSWindow @@ -64,7 +64,7 @@ 268 {{132, 5}, {21, 18}} - + _NS:22 YES @@ -96,6 +96,7 @@ 268 {{103, 5}, {21, 18}} + _NS:22 YES @@ -135,8 +136,9 @@ 4352 - {181, 669} + {191, 567} + _NS:13 YES @@ -151,7 +153,7 @@ AutomaticTableColumnIdentifier.0 - 178 + 188 16 1000 @@ -245,8 +247,9 @@ NO - {181, 669} + {191, 567} + _NS:11 @@ -258,6 +261,7 @@ -2147483392 {{224, 17}, {15, 102}} + _NS:15 NO @@ -270,6 +274,7 @@ -2147483392 {{1, 119}, {238, 15}} + _NS:60 NO @@ -279,8 +284,9 @@ 0.99328859060402686 - {181, 669} + {191, 567} + _NS:9 133680 @@ -299,8 +305,9 @@ 12 - {{-2, 0}, {5, 669}} + {{-2, 0}, {5, 567}} + _NS:9 {0, 0} @@ -329,22 +336,25 @@ NO - {{182, 0}, {598, 669}} + {{192, 0}, {633, 567}} + _NS:13 - {{0, 32}, {780, 669}} + {{0, 32}, {825, 567}} + _NS:9 YES 2 - {780, 701} + {825, 599} + {{0, 0}, {2560, 1418}} @@ -356,6 +366,22 @@ + + + outlineView + + + + 500 + + + + window + + + + 501 + textField @@ -366,7 +392,7 @@ 266 - {{0, 1}, {178, 14}} + {{0, 1}, {188, 14}} _NS:101 @@ -396,7 +422,7 @@ NO - {{1, 0}, {178, 17}} + {{1, 0}, {188, 17}} HeaderCell @@ -446,7 +472,7 @@ 266 - {{25, 0}, {153, 17}} + {{25, 0}, {163, 17}} _NS:80 @@ -464,7 +490,7 @@ NO - {{1, 17}, {178, 17}} + {{1, 17}, {188, 17}} DataCell @@ -1269,9 +1295,39 @@ - 499 + 501 + + + + + MPMainWindowController + NSWindowController + + outlineView + NSOutlineView + + + outlineView + + outlineView + NSOutlineView + + + + IBProjectSource + ./Classes/MPMainWindowController.h + + + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + + - 0 IBCocoaFramework YES diff --git a/MacPass/PasswordView.xib b/MacPass/PasswordView.xib new file mode 100644 index 00000000..7f48b310 --- /dev/null +++ b/MacPass/PasswordView.xib @@ -0,0 +1,685 @@ + + + + 1080 + 12C60 + 3084 + 1187.34 + 625.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 3084 + + + IBNSLayoutConstraint + NSButton + NSButtonCell + NSCustomObject + NSCustomView + NSPathCell + NSPathControl + NSSecureTextField + NSSecureTextFieldCell + NSTextField + NSTextFieldCell + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + NSObject + + + FirstResponder + + + NSApplication + + + + 268 + + + + 268 + + Apple URL pasteboard type + NSFilenamesPboardType + + {{175, 105}, {197, 22}} + + + + _NS:9 + YES + + 337641473 + 131072 + + + file://localhost/Users/ + + + LucidaGrande + 11 + 3100 + + + _NS:9 + + + + 67108928 + 1024 + Basecamp + + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + + file://localhost/ + + + + 67108928 + 1024 + Hometown + + + + + + file://localhost/ + + + + 67108928 + 1024 + Users + + + + + + file://localhost/Users + + + + 2 + + + + NO + + + + 268 + {{109, 142}, {64, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Password + + LucidaGrande + 13 + 1044 + + _NS:1535 + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + + NO + + + + 268 + {{127, 109}, {46, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Keyfile + + _NS:1535 + + + + + NO + + + + 268 + {{178, 142}, {191, 22}} + + + + _NS:9 + YES + + 342884416 + 272630848 + + + _NS:9 + + YES + + + 6 + System + textColor + + + + NSAllRomanInputSourcesLocaleIdentifier + + + NO + + + + 268 + {{315, 60}, {74, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Open + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + + + {480, 272} + + + + NSView + + + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + + + 6 + 0 + + 6 + 1 + + 97 + + 1000 + + 3 + 9 + 3 + + + + 4 + 0 + + 4 + 1 + + 67 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 108 + + 1000 + + 3 + 9 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 4 + 0 + + 4 + 1 + + 109 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 112 + + 1000 + + 3 + 9 + 3 + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + + + + + + + + 2 + + + + + + + + 3 + + + + + 6 + + + + + + 7 + 0 + + 0 + 1 + + 191 + + 1000 + + 3 + 9 + 1 + + + + + + 7 + + + + + 17 + + + + + + + + 18 + + + + + 31 + + + + + + + + 32 + + + + + 37 + + + + + 45 + + + + + 72 + + + + + + + + 73 + + + + + 81 + + + + + 83 + + + + + 84 + + + + + 88 + + + + + 92 + + + + + 93 + + + + + 94 + + + + + 95 + + + + + 90 + + + + + 89 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 98 + + + + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + + + + 0 + IBCocoaFramework + YES + 3 + YES + + diff --git a/MacPass/PasswordWindow.xib b/MacPass/PasswordWindow.xib deleted file mode 100644 index f3ce3972..00000000 --- a/MacPass/PasswordWindow.xib +++ /dev/null @@ -1,123 +0,0 @@ - - - - 1080 - 12C60 - 2844 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2844 - - - NSCustomObject - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - NSObject - - - FirstResponder - - - NSApplication - - - 15 - 2 - {{196, 207}, {482, 258}} - 611845120 - Window - NSWindow - - - - - 256 - {482, 258} - - - _NS:20 - - {{0, 0}, {2560, 1418}} - {10000000000000, 10000000000000} - YES - - - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 293 - - - - - - - - 294 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 294 - - - 0 - IBCocoaFramework - YES - 3 - YES - -