diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 6733f2bf..86a8e804 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -100,6 +100,8 @@ 4CAD747F15B887FD00104512 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD746115B887FD00104512 /* DDXMLNode.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; 4CAD748C15B889B700104512 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748B15B889B700104512 /* Security.framework */; }; 4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; }; + 4CB25D54175A206000D1369D /* MPRoundedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB25D53175A206000D1369D /* MPRoundedTextFieldCell.m */; }; + 4CB25D57175A208300D1369D /* MPTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB25D56175A208300D1369D /* MPTextField.m */; }; 4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4CB9339716D3A0DD00A13B5D /* Credits.rtf */; }; 4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */; }; 4CBFA240172B385D006090DF /* PasswordEditView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CBFA23F172B385D006090DF /* PasswordEditView.xib */; }; @@ -296,6 +298,10 @@ 4CAD746315B887FD00104512 /* DDXMLPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLPrivate.h; sourceTree = ""; }; 4CAD748B15B889B700104512 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 4CAD748D15B88AC100104512 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + 4CB25D52175A206000D1369D /* MPRoundedTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPRoundedTextFieldCell.h; sourceTree = ""; }; + 4CB25D53175A206000D1369D /* MPRoundedTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPRoundedTextFieldCell.m; sourceTree = ""; }; + 4CB25D55175A208300D1369D /* MPTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPTextField.h; sourceTree = ""; }; + 4CB25D56175A208300D1369D /* MPTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTextField.m; sourceTree = ""; }; 4CB9339816D3A0DD00A13B5D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = ""; }; 4CBA2AB617074B59006D8139 /* MPSettingsHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSettingsHelper.h; sourceTree = ""; }; 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSettingsHelper.m; sourceTree = ""; }; @@ -370,6 +376,10 @@ 4CE39AC316ECE4F7000FE29D /* MPPopupImageView.m */, 4C3D4C0617594CA40038DAAC /* MPSeparator.h */, 4C3D4C0717594CA40038DAAC /* MPSeparator.m */, + 4CB25D52175A206000D1369D /* MPRoundedTextFieldCell.h */, + 4CB25D53175A206000D1369D /* MPRoundedTextFieldCell.m */, + 4CB25D55175A208300D1369D /* MPTextField.h */, + 4CB25D56175A208300D1369D /* MPTextField.m */, ); name = Views; sourceTree = ""; @@ -964,6 +974,8 @@ 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */, 4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */, 4C3D4C0817594CA40038DAAC /* MPSeparator.m in Sources */, + 4CB25D54175A206000D1369D /* MPRoundedTextFieldCell.m in Sources */, + 4CB25D57175A208300D1369D /* MPTextField.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MacPass/InspectorView.xib b/MacPass/InspectorView.xib index bd57ded4..7e185229 100644 --- a/MacPass/InspectorView.xib +++ b/MacPass/InspectorView.xib @@ -556,70 +556,6 @@ 24 2 - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 3 - 0 - - 3 - 1 - - 222 - - 1000 - - 3 - 9 - 3 - 5 @@ -684,6 +620,70 @@ 24 2 + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 222 + + 1000 + + 3 + 9 + 3 + 5 @@ -1500,14 +1500,14 @@ - - - - + + + + @@ -1552,6 +1552,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + MPRoundedTextFieldCell com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1679,6 +1680,14 @@ ./Classes/MPPopupImageView.h + + MPRoundedTextFieldCell + NSTextFieldCell + + IBProjectSource + ./Classes/MPRoundedTextFieldCell.h + + MPSeparator NSView diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m index eafa2fa8..6d52f427 100644 --- a/MacPass/MPInspectorViewController.m +++ b/MacPass/MPInspectorViewController.m @@ -65,7 +65,6 @@ [[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised]; [self.itemImageView setTarget:self]; - /* Register for Entry selection */ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didChangeSelectedEntry:) diff --git a/MacPass/MPOutlineViewDelegate.m b/MacPass/MPOutlineViewDelegate.m index 6006296b..2148a7f1 100644 --- a/MacPass/MPOutlineViewDelegate.m +++ b/MacPass/MPOutlineViewDelegate.m @@ -42,7 +42,8 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell"; } - (BOOL)outlineView:(NSOutlineView *)outlineView isGroupItem:(id)item { - if(item == nil) { + KdbGroup *group = item; + if(!group.parent) { return YES; } return NO; diff --git a/MacPass/MPRoundedTextFieldCell.h b/MacPass/MPRoundedTextFieldCell.h new file mode 100644 index 00000000..1f92c070 --- /dev/null +++ b/MacPass/MPRoundedTextFieldCell.h @@ -0,0 +1,14 @@ +// +// MPRoundedTextFieldCell.h +// MacPass +// +// Created by Michael Starke on 01.06.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import + +@interface MPRoundedTextFieldCell : NSTextFieldCell + + +@end diff --git a/MacPass/MPRoundedTextFieldCell.m b/MacPass/MPRoundedTextFieldCell.m new file mode 100644 index 00000000..89652d76 --- /dev/null +++ b/MacPass/MPRoundedTextFieldCell.m @@ -0,0 +1,19 @@ +// +// MPRoundedTextFieldCell.m +// MacPass +// +// Created by Michael Starke on 01.06.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import "MPRoundedTextFieldCell.h" + +#define CORNER_RADIUS 5.0 + +@implementation MPRoundedTextFieldCell + +- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { + [super drawWithFrame:cellFrame inView:controlView]; +} + +@end diff --git a/MacPass/MPTextField.h b/MacPass/MPTextField.h new file mode 100644 index 00000000..e46d81bf --- /dev/null +++ b/MacPass/MPTextField.h @@ -0,0 +1,14 @@ +// +// MPTextField.h +// MacPass +// +// Created by Michael Starke on 01.06.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import + +@interface MPTextField : NSTextField + + +@end diff --git a/MacPass/MPTextField.m b/MacPass/MPTextField.m new file mode 100644 index 00000000..68e2fc17 --- /dev/null +++ b/MacPass/MPTextField.m @@ -0,0 +1,39 @@ +// +// MPTextField.m +// MacPass +// +// Created by Michael Starke on 01.06.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import "MPTextField.h" +#import "MPRoundedTextFieldCell.h" + +@implementation MPTextField + ++ (Class)cellClass { + return [MPRoundedTextFieldCell class]; +} + +- (id)initWithCoder:(NSCoder *)aDecoder { + self = [super initWithCoder:aDecoder]; + if(self) { + MPRoundedTextFieldCell *newCell = [[MPRoundedTextFieldCell alloc] init]; + NSTextFieldCell *cell = [self cell]; + [newCell setBackgroundStyle:[cell backgroundStyle]]; + [newCell setBezeled:[cell isBezeled]]; + [newCell setBordered:[cell isBordered]]; + [newCell setBackgroundColor:[cell backgroundColor]]; + [newCell setTextColor:[cell textColor]]; + [newCell setDrawsBackground:[cell drawsBackground]]; + [newCell setAction:[cell action]]; + [newCell setTarget:[cell target]]; + [newCell setEditable:[cell isEditable]]; + [newCell setEnabled:[cell isEnabled]]; + [self setCell:newCell]; + [newCell release]; + } + return self; +} + +@end diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 431c86d6..2f62a734 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -46,7 +46,7 @@ CFBundleSignature ???? CFBundleVersion - 75B + 788 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/OutlineView.xib b/MacPass/OutlineView.xib index 0471944f..23c964d2 100644 --- a/MacPass/OutlineView.xib +++ b/MacPass/OutlineView.xib @@ -45,20 +45,20 @@ 268 - + 268 - - + + 2304 - - + + 256 {191, 299} - + _NS:13 @@ -72,7 +72,7 @@ _NS:16 - + AutomaticTableColumnIdentifier.0 188 16 @@ -100,7 +100,7 @@ - + 337641536 2048 Text Cell @@ -109,7 +109,7 @@ 13 1044 - + 6 System @@ -129,7 +129,7 @@ 3 YES YES - + 3 @@ -170,41 +170,41 @@ 1 -1 NO - 14 {191, 299} - + - + _NS:11 - + 4 - - + + -2147483392 {{224, 17}, {15, 102}} - + - + _NS:15 NO - + _doScroller: 0.99749373433583954 - - + + -2147483392 {{1, 119}, {238, 15}} - + + _NS:60 NO 1 - + _doScroller: 0.99328859060402686 @@ -212,12 +212,12 @@ {191, 299} - + _NS:9 133680 - - - + + + QSAAAEEgAABBwAAAQcAAAA 0.25 4 @@ -227,6 +227,7 @@ {191, 299} + _NS:9 NSView @@ -237,9 +238,9 @@ outlineView - + - 97 + 271 @@ -247,7 +248,7 @@ - 201 + 273 @@ -295,7 +296,7 @@ - 84 + 245 @@ -341,7 +342,7 @@ 266 {{25, 0}, {163, 17}} - + _NS:80 YES @@ -363,7 +364,7 @@ - 85 + 246 @@ -371,7 +372,7 @@ - 86 + 247 @@ -405,7 +406,7 @@ - + 4 0 @@ -421,7 +422,7 @@ 3 - + 6 0 @@ -436,8 +437,24 @@ 29 3 + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + - + 5 0 @@ -452,117 +469,129 @@ 29 3 - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 8 - 29 - 3 - - + - 66 - + 227 + - - - + + + - 69 - - - - - 68 - - - - - 67 - + 228 + - + - + - 70 - + 229 + + + + + 230 + + + + + 231 + - + - + - + - 79 - + 232 + + + + + 237 + - - - 3 + + + + 10 0 - - 3 + + 10 1 0.0 1000 - - 6 - 24 + + 5 + 22 2 + + + 6 + 0 + + 6 + 1 + + 3 + + 1000 + + 8 + 29 + 3 + - + 5 0 - + 5 1 3 1000 - + 8 29 3 - - - 4 - 0 - - 4 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - + + + + + 238 + + + + + + + + 239 + + + + + 240 + + + + + 6 0 @@ -578,22 +607,6 @@ 29 3 - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 5 - 22 - 2 - 5 @@ -610,142 +623,78 @@ 24 3 - - - - - - - 76 - - - - - 6 + + + 4 0 - - 6 - 1 - - 3 - - 1000 - - 8 - 29 - 3 - - - - 10 - 0 - - 10 + + 4 1 0.0 1000 - - 5 - 22 + + 6 + 24 2 - - + + 5 0 - + 5 1 3 1000 - + 8 29 3 - + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + - + - 71 - - - - - 87 - - - - - 88 - - - - - 89 - - - - - 77 - - - - - - - - 78 - - - - - 92 - - - - - 94 - - - - - 95 - - - - - 90 - - - - - 91 - - - - - 93 - - - - - 82 - - - - - - - - 80 + 241 + 7 @@ -762,42 +711,94 @@ 9 1 - - 96 - - - - - 81 + 242 - 83 + 243 + + + + + + + + 244 - 219 - - + 252 + + - 220 + 253 + + + + + 254 + + + + + 255 + + + + + 256 + + + + + 257 + + + + + 258 + + + + + 259 + + + + + 260 + + + + + 261 + + + + + 263 - 222 + 267 + + + + + 269 - 223 + 270 @@ -808,74 +809,74 @@ 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 - HeaderCell - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - + com.apple.InterfaceBuilder.CocoaPlugin + - - - com.apple.InterfaceBuilder.CocoaPlugin - DataCell - + com.apple.InterfaceBuilder.CocoaPlugin + HeaderCell + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + DataCell + - - 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 + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 223 + 273