added sketch files

This commit is contained in:
Michael Starke
2013-02-17 18:55:27 +01:00
parent c55adff775
commit f20e3d6e1e
20 changed files with 169 additions and 8 deletions

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View File

View File

@@ -0,0 +1 @@
8

View File

@@ -9,7 +9,15 @@
/* Begin PBXBuildFile section */
4C25D58516CF0F8800F6806C /* WelcomeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58416CF0F8800F6806C /* WelcomeView.xib */; };
4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58616CF0FAA00F6806C /* EntryView.xib */; };
4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */; };
4C2E381E16D11FF900037A9D /* 04_KlipperTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381B16D11FF900037A9D /* 04_KlipperTemplate.pdf */; };
4C2E381F16D11FF900037A9D /* 05_LanguagesTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C2E381C16D11FF900037A9D /* 05_LanguagesTemplate.pdf */; };
4C2E382316D1421B00037A9D /* MPIconHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382216D1421B00037A9D /* MPIconHelper.m */; };
4C2E382616D1470200037A9D /* MPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382516D1470200037A9D /* MPViewController.m */; };
4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; };
4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9D16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf */; };
4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */; };
4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */; };
4C669B7F16760ED100DD0774 /* AesInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3116760ED100DD0774 /* AesInputStream.m */; };
4C669B8016760ED100DD0774 /* AesOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3316760ED100DD0774 /* AesOutputStream.m */; };
4C669B8116760ED100DD0774 /* Arc4RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3516760ED100DD0774 /* Arc4RandomStream.m */; };
@@ -74,8 +82,18 @@
/* Begin PBXFileReference section */
4C25D58416CF0F8800F6806C /* WelcomeView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WelcomeView.xib; sourceTree = "<group>"; };
4C25D58616CF0FAA00F6806C /* EntryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EntryView.xib; sourceTree = "<group>"; };
4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 03_ServerTemplate.pdf; sourceTree = "<group>"; };
4C2E381B16D11FF900037A9D /* 04_KlipperTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 04_KlipperTemplate.pdf; sourceTree = "<group>"; };
4C2E381C16D11FF900037A9D /* 05_LanguagesTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 05_LanguagesTemplate.pdf; sourceTree = "<group>"; };
4C2E382116D1421B00037A9D /* MPIconHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPIconHelper.h; sourceTree = "<group>"; };
4C2E382216D1421B00037A9D /* MPIconHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIconHelper.m; sourceTree = "<group>"; };
4C2E382416D1470200037A9D /* MPViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPViewController.h; sourceTree = "<group>"; };
4C2E382516D1470200037A9D /* MPViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPViewController.m; sourceTree = "<group>"; };
4C37A83E15B8B474005EF8EE /* MPOutlineDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineDataSource.h; sourceTree = "<group>"; };
4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineDataSource.m; sourceTree = "<group>"; };
4C586F9D16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 00_PasswordTemplate.pdf; sourceTree = "<group>"; };
4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 01_PackageNetworkTemplate.pdf; sourceTree = "<group>"; };
4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 02_MessageBoxWarningTemplate.pdf; sourceTree = "<group>"; };
4C669B3016760ED100DD0774 /* AesInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesInputStream.h; sourceTree = "<group>"; };
4C669B3116760ED100DD0774 /* AesInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesInputStream.m; sourceTree = "<group>"; };
4C669B3216760ED100DD0774 /* AesOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesOutputStream.h; sourceTree = "<group>"; };
@@ -225,6 +243,15 @@
name = Views;
sourceTree = "<group>";
};
4C2E382016D141F700037A9D /* Helper */ = {
isa = PBXGroup;
children = (
4C2E382116D1421B00037A9D /* MPIconHelper.h */,
4C2E382216D1421B00037A9D /* MPIconHelper.m */,
);
name = Helper;
sourceTree = "<group>";
};
4C37A84115B8B47D005EF8EE /* Delegates */ = {
isa = PBXGroup;
children = (
@@ -249,6 +276,19 @@
name = Model;
sourceTree = "<group>";
};
4C586F9C16D07ABD00E7DB57 /* Icons */ = {
isa = PBXGroup;
children = (
4C586F9D16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf */,
4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */,
4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */,
4C2E381A16D11FF900037A9D /* 03_ServerTemplate.pdf */,
4C2E381B16D11FF900037A9D /* 04_KlipperTemplate.pdf */,
4C2E381C16D11FF900037A9D /* 05_LanguagesTemplate.pdf */,
);
path = Icons;
sourceTree = "<group>";
};
4C669B2D16760ED100DD0774 /* MiniKeePassLib */ = {
isa = PBXGroup;
children = (
@@ -388,6 +428,8 @@
4C77E36C15B84A240093A587 /* MacPass */ = {
isa = PBXGroup;
children = (
4C2E382016D141F700037A9D /* Helper */,
4C586F9C16D07ABD00E7DB57 /* Icons */,
4CA0B30F15BCB85D00654E32 /* General */,
4CA0B30E15BCB70200654E32 /* Protocolls */,
4CA0B2F115BCAEE600654E32 /* Controller */,
@@ -422,6 +464,8 @@
4C83814115BF4677001AE468 /* MPMainWindowController.m */,
4C75CE3A16CB128700F61A4D /* MPDatabaseController.h */,
4C75CE3B16CB128700F61A4D /* MPDatabaseController.m */,
4C2E382416D1470200037A9D /* MPViewController.h */,
4C2E382516D1470200037A9D /* MPViewController.m */,
);
name = Controller;
sourceTree = "<group>";
@@ -555,6 +599,12 @@
4C6B0E8C16C9B99B00A9ED23 /* PasswordView.xib in Resources */,
4C25D58516CF0F8800F6806C /* WelcomeView.xib in Resources */,
4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */,
4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */,
4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */,
4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */,
4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */,
4C2E381E16D11FF900037A9D /* 04_KlipperTemplate.pdf in Resources */,
4C2E381F16D11FF900037A9D /* 05_LanguagesTemplate.pdf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -615,6 +665,8 @@
4C669BA216760ED100DD0774 /* UUID.m in Sources */,
4C90D9B416CA4B18003081E7 /* MPMainWindowDelegate.m in Sources */,
4C75CE3C16CB128700F61A4D /* MPDatabaseController.m in Sources */,
4C2E382316D1421B00037A9D /* MPIconHelper.m in Sources */,
4C2E382616D1470200037A9D /* MPViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -673,7 +725,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "/usr/include/libxml2/**";
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**";
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lxml2";
@@ -700,7 +752,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "/usr/include/libxml2/**";
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**";
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_LDFLAGS = "-lxml2";
SDKROOT = macosx;
@@ -714,6 +766,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch";
INFOPLIST_FILE = "MacPass/MacPass-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.8;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -726,6 +779,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch";
INFOPLIST_FILE = "MacPass/MacPass-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.8;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -19,8 +19,8 @@ APPKIT_EXTERN NSString *const MPDataBaseDocumentDocumentKey;
@property (retain, readonly) KdbGroup *root;
@property (retain, readonly) NSURL *file;
@property (retain, readonly) KdbPassword *password;
+ (id)documentWithFile:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key;
+ (id)documentWithFile:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key;
- (id)initWithFile:(NSURL *)file password:(NSString *)password keyfile:(NSURL *)key;
/*
Saves the current database to the filesystem

View File

@@ -12,9 +12,11 @@
NSString *const MPDidLoadDataBaseNotification = @"DidLoadDataBaseNotification";
@interface MPDatabaseDocument ()
@property (retain) KdbTree *tree;
@property (retain) NSURL *file;
@property (retain) KdbPassword *password;
@end
@implementation MPDatabaseDocument

28
MacPass/MPIconHelper.h Normal file
View File

@@ -0,0 +1,28 @@
//
// MPIconHelper.h
// MacPass
//
// Created by Michael Starke on 17.02.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import <Foundation/Foundation.h>
typedef enum {
MPIconPassword,
MPIconPackageNetwork,
MPIconWarning,
MPIconServer,
MPIconKlipper,
MPIconLanguages
} MPIconType;
@interface MPIconHelper : NSObject
+ (NSImage *)icon:(MPIconType)type;
/*
Available Icons, Use the MPDatabaseIconType to access a individual icon;
*/
+ (NSDictionary *)availableIcons;
@end

31
MacPass/MPIconHelper.m Normal file
View File

@@ -0,0 +1,31 @@
//
// MPIconHelper.m
// MacPass
//
// Created by Michael Starke on 17.02.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import "MPIconHelper.h"
@implementation MPIconHelper
# pragma mark Icon accessors
+ (NSImage *)icon:(MPIconType)type {
NSDictionary *icons = [MPIconHelper availableIcons];
NSString *imageName = icons[@(type)];
return [[NSBundle mainBundle] imageForResource:imageName];
}
+ (NSDictionary *)availableIcons {
NSDictionary *imageNames = @{ @(MPIconKlipper): @"04_KlipperTemplate",
@(MPIconLanguages): @"05_LanguagesTemplate",
@(MPIconPackageNetwork): @"01_PackageNetworkTemplate",
@(MPIconPassword): @"00_PasswordTemplate",
@(MPIconServer): @"03_ServerTemplate",
@(MPIconWarning): @"02_MessageBoxWarningTemplate" };
return imageNames;
}
@end

View File

@@ -7,6 +7,7 @@
//
#import "MPOutlineViewDelegate.h"
#import "MPIconHelper.h"
#import "KdbLib.h"
@implementation MPOutlineViewDelegate
@@ -20,7 +21,10 @@
}
else {
view = [outlineView makeViewWithIdentifier:@"DataCell" owner:self];
[view.imageView setImage:[NSImage imageNamed:NSImageNameFolder]];
NSDictionary *availableIcons = [MPIconHelper availableIcons];
NSInteger randomIndex = rand() % [availableIcons count];
NSImage *icon = [MPIconHelper icon:(MPIconType)randomIndex];
[view.imageView setImage:icon];
[view.textField setStringValue:[group name]];
}

View File

@@ -0,0 +1,15 @@
//
// MPViewController.h
// MacPass
//
// Created by Michael Starke on 17.02.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface MPViewController : NSViewController
- (void)didLoadView;
@end

View File

@@ -0,0 +1,22 @@
//
// MPViewController.m
// MacPass
//
// Created by Michael Starke on 17.02.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import "MPViewController.h"
@implementation MPViewController
- (void)loadView {
[super loadView];
[self didLoadView];
}
- (void)didLoadView {
// override
}
@end

View File

@@ -231,7 +231,7 @@
<bytes key="NSWhite">MC41AA</bytes>
</object>
</object>
<double key="NSRowHeight">20</double>
<double key="NSRowHeight">24</double>
<int key="NSTvFlags">-767524864</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
@@ -323,7 +323,7 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="777456971"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSAutorecalculatesContentBorderThicknessMinY">NO</bool>
<double key="NSContentBorderThicknessMinY">32</double>
@@ -1133,7 +1133,6 @@
<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="421.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
<string key="422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1212,6 +1211,7 @@
<string key="outlineView">NSOutlineView</string>
<string key="passwordTextField">NSTextField</string>
<string key="passwordView">NSView</string>
<string key="welcomeView">NSView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="contentView">
@@ -1234,6 +1234,10 @@
<string key="name">passwordView</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="welcomeView">
<string key="name">welcomeView</string>
<string key="candidateClassName">NSView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>