Added new icons for inspector and delete
This commit is contained in:
michael starke
2013-06-15 22:03:58 +02:00
parent 3821122e7b
commit eb6f5c3411
19 changed files with 372 additions and 443 deletions

File diff suppressed because one or more lines are too long

View File

@@ -88,6 +88,8 @@
4C7615631764C08C0015A1A6 /* PasswordEditView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C7615651764C08C0015A1A6 /* PasswordEditView.xib */; };
4C7615681764C0C40015A1A6 /* PasswordInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76156A1764C0C40015A1A6 /* PasswordInputView.xib */; };
4C76156D1764C0E20015A1A6 /* InspectorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76156F1764C0E20015A1A6 /* InspectorView.xib */; };
4C7714AA176C998F00549F2A /* 43_TrashTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7714A9176C998F00549F2A /* 43_TrashTemplate.pdf */; };
4C7714AC176C9D4600549F2A /* 99_InfoTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7714AB176C9D4600549F2A /* 99_InfoTemplate.pdf */; };
4C77547516E55FE800970E02 /* MPInspectorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77547416E55FE800970E02 /* MPInspectorViewController.m */; };
4C77E36715B84A240093A587 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; };
4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E36F15B84A240093A587 /* InfoPlist.strings */; };
@@ -300,6 +302,8 @@
4C76157B1764C5450015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
4C76157C1764C8B40015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InspectorView.strings; sourceTree = "<group>"; };
4C76157D1764C8B90015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InspectorView.strings; sourceTree = "<group>"; };
4C7714A9176C998F00549F2A /* 43_TrashTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 43_TrashTemplate.pdf; sourceTree = "<group>"; };
4C7714AB176C9D4600549F2A /* 99_InfoTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 99_InfoTemplate.pdf; sourceTree = "<group>"; };
4C77547316E55FE800970E02 /* MPInspectorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPInspectorViewController.h; sourceTree = "<group>"; };
4C77547416E55FE800970E02 /* MPInspectorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPInspectorViewController.m; sourceTree = "<group>"; };
4C77E36215B84A240093A587 /* MacPass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacPass.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -531,6 +535,8 @@
4CD78AB916D155FF00768A1D /* 09_IdentityTemplate.pdf */,
4CD78ABA16D155FF00768A1D /* 10_ContactTemplate.pdf */,
4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */,
4C7714A9176C998F00549F2A /* 43_TrashTemplate.pdf */,
4C7714AB176C9D4600549F2A /* 99_InfoTemplate.pdf */,
);
path = Icons;
sourceTree = "<group>";
@@ -953,6 +959,8 @@
4C5A11FF1708DE8800223D8A /* PasswordCreatorView.xib in Resources */,
4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */,
4C7615631764C08C0015A1A6 /* PasswordEditView.xib in Resources */,
4C7714AA176C998F00549F2A /* 43_TrashTemplate.pdf in Resources */,
4C7714AC176C9D4600549F2A /* 99_InfoTemplate.pdf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -970,7 +978,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#!/bin/bash\nbuildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nbuildNumber=$((0x$buildNumber))\nbuildNumber=$(($buildNumber + 1))\nbuildNumber=$(printf \"%X\" $buildNumber)\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"$INFOPLIST_FILE\"";
shellScript = "#!/bin/bash\nbuildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\n#buildNumber=$((0x$buildNumber))\nbuildNumber=$(($buildNumber + 1))\nbuildNumber=$(printf \"%d\" $buildNumber)\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"$INFOPLIST_FILE\"";
};
/* End PBXShellScriptBuildPhase section */

View File

@@ -61,7 +61,7 @@
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="160641004">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags">-1543503872</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Round Rect Button</string>
<object class="NSFont" key="NSSupport">

Binary file not shown.

Binary file not shown.

View File

@@ -17,16 +17,13 @@
@class MPCreationViewController;
@interface MPDocumentWindowController : NSWindowController <NSWindowDelegate> {
@private
NSArray *_inspectorContraints;
}
@interface MPDocumentWindowController : NSWindowController <NSWindowDelegate>
@property (readonly, retain) MPPasswordInputController *passwordInputController;
@property (readonly, retain) MPPasswordEditViewController *passwordEditController;
@property (readonly, retain) MPEntryViewController *entryViewController;
@property (readonly, retain) MPOutlineViewController *outlineViewController;
@property (readonly, retain) MPInspectorViewController *inspectorTabViewController;
@property (readonly, retain) MPInspectorViewController *inspectorViewController;
@property (readonly, retain) MPCreationViewController *creationViewController;

View File

@@ -31,7 +31,7 @@
@property (retain) MPPasswordEditViewController *passwordEditController;
@property (retain) MPEntryViewController *entryViewController;
@property (retain) MPOutlineViewController *outlineViewController;
@property (retain) MPInspectorViewController *inspectorTabViewController;
@property (retain) MPInspectorViewController *inspectorViewController;
@property (retain) MPToolbarDelegate *toolbarDelegate;
@@ -46,21 +46,20 @@
_firstResponder = nil;
_toolbarDelegate = [[MPToolbarDelegate alloc] init];
_outlineViewController = [[MPOutlineViewController alloc] init];
_inspectorTabViewController = [[MPInspectorViewController alloc] init];
_passwordEditController = [[MPPasswordEditViewController alloc] init];
_entryViewController = [[MPEntryViewController alloc] init];
_inspectorViewController = [[MPInspectorViewController alloc] init];
}
return self;
}
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
[_toolbar release];
[_passwordInputController release];
[_entryViewController release];
[_outlineViewController release];
[_inspectorTabViewController release];
[_inspectorViewController release];
[_creationViewController release];
[_toolbarDelegate release];
@@ -71,6 +70,9 @@
#pragma mark View Handling
- (void)windowDidLoad
{
[_entryViewController setupNotifications:self];
[_inspectorViewController setupNotifications:self];
[super windowDidLoad];
_toolbar = [[NSToolbar alloc] initWithIdentifier:@"MainWindowToolbar"];
[self.toolbar setAllowsUserCustomization:YES];
@@ -80,7 +82,7 @@
[self.splitView setTranslatesAutoresizingMaskIntoConstraints:NO];
NSView *outlineView = [_outlineViewController view];
NSView *inspectorView = [_inspectorTabViewController view];
NSView *inspectorView = [_inspectorViewController view];
NSView *entryView = [_entryViewController view];
[_splitView addSubview:outlineView];
[_splitView addSubview:entryView];
@@ -151,6 +153,12 @@
if(itemAction == [MPActionHelper actionOfType:MPActionAddEntry]) {
return (nil != _entryViewController.activeGroup);
}
if(itemAction == [MPActionHelper actionOfType:MPActionDelete]) {
return (_entryViewController.activeGroup || _entryViewController.selectedEntry);
}
if(itemAction == [MPActionHelper actionOfType:MPActionToggleInspector]) {
return (nil != [_splitView superview]);
}
return YES;
}
@@ -179,11 +187,11 @@
}
- (void)createGroup:(id)sender {
NSLog(@"WindowControllerCreateGroup");
[_outlineViewController createGroup:nil];
}
- (void)toggleInspector:(id)sender {
NSView *inspectorView = [_inspectorTabViewController view];
NSView *inspectorView = [_inspectorViewController view];
if([inspectorView superview]) {
[inspectorView removeFromSuperview];
}
@@ -203,7 +211,7 @@
[contentView addSubview:_splitView];
[_splitView adjustSubviews];
NSView *outlineView = [_outlineViewController view];
NSView *inspectorView = [_inspectorTabViewController view];
NSView *inspectorView = [_inspectorViewController view];
NSView *entryView = [_entryViewController view];
NSDictionary *views = NSDictionaryOfVariableBindings(outlineView, inspectorView, entryView, _splitView);
@@ -235,7 +243,7 @@
[contentView layout];
[_entryViewController updateResponderChain];
[_inspectorTabViewController updateResponderChain];
[_inspectorViewController updateResponderChain];
[_outlineViewController updateResponderChain];
[_outlineViewController showOutline];
}

View File

@@ -27,6 +27,7 @@ typedef enum {
@class KdbGroup;
@class KdbEntry;
@class MPOutlineViewDelegate;
@class MPDocumentWindowController;
@interface MPEntryViewController : MPViewController <NSTableViewDelegate>
@@ -37,6 +38,9 @@ typedef enum {
@property (nonatomic, retain) NSString *filter;
/* Call this after alle viewcontroller are loaded */
- (void)setupNotifications:(MPDocumentWindowController *)windowController;
/* Clear the Search filter*/
- (void)showFilter:(id)sender;
- (void)clearFilter:(id)sender;

View File

@@ -120,12 +120,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
[self _hideFilterBarAnimated:NO];
[_bottomBar setBorderType:HNHBorderTop];
MPDocumentWindowController *windowController = [self windowController];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(_didChangeGroupSelectionInOutlineView:)
name:MPOutlineViewDidChangeGroupSelection
object:windowController.outlineViewController.outlineDelegate];
[self.entryTable setDelegate:self];
[self.entryTable setDoubleAction:@selector(_columnDoubleClick:)];
[self.entryTable setTarget:self];
@@ -170,6 +164,14 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
[parentColumn setHidden:YES];
}
- (void)setupNotifications:(MPDocumentWindowController *)windowController {
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(_didChangeGroupSelectionInOutlineView:)
name:MPOutlineViewDidChangeGroupSelection
object:windowController.outlineViewController.outlineDelegate];
}
#pragma mark NSTableViewDelgate
- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {

View File

@@ -19,7 +19,9 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
MPIconSocket,
MPIconIdentity,
MPIconContact,
MPIconCamera
MPIconCamera,
MPIconTrash,
MPIconInfo
};
@interface MPIconHelper : NSObject

View File

@@ -40,7 +40,9 @@
@(MPIconContact): @"10_ContactTemplate",
@(MPIconIdentity): @"09_IdentityTemplate",
@(MPIconNotepad): @"07_NotepadTemplate",
@(MPIconSocket): @"08_SocketTemplate"
@(MPIconSocket): @"08_SocketTemplate",
@(MPIconTrash): @"43_TrashTemplate",
@(MPIconInfo): @"99_InfoTemplate"
};
return imageNames;
}

View File

@@ -12,6 +12,7 @@
@class KdbEntry;
@class KdbGroup;
@class HNHGradientView;
@class MPDocumentWindowController;
@interface MPInspectorViewController : MPViewController
@@ -26,5 +27,7 @@
@property (assign) IBOutlet HNHGradientView *bottomBar;
- (void)closeActivePopup:(id)sender;
/* Seperate call to ensure alle registered objects are in place */
- (void)setupNotifications:(MPDocumentWindowController *)windowController;
@end

View File

@@ -14,6 +14,9 @@
#import "MPIconHelper.h"
#import "MPPopupImageView.h"
#import "MPIconSelectViewController.h"
#import "MPDocumentWindowController.h"
#import "MPOutlineViewController.h"
#import "MPOutlineViewDelegate.h"
#import "KdbLib.h"
#import "KdbGroup+Undo.h"
#import "KdbEntry+Undo.h"
@@ -59,18 +62,21 @@
[[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
[self.itemImageView setTarget:self];
[_bottomBar setBorderType:HNHBorderTop];
[self _clearContent];
}
- (void)setupNotifications:(MPDocumentWindowController *)windowController {
/* Register for Entry selection */
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(_didChangeSelectedEntry:)
name:MPDidChangeSelectedEntryNotification
object:nil];
object:windowController.entryViewController];
/* Register for Group selection */
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(_didChangeSelectedGroup:)
name:MPOutlineViewDidChangeGroupSelection
object:nil];
[self _clearContent];
object:windowController.outlineViewController.outlineDelegate];
}
- (void)_updateContent {

View File

@@ -20,6 +20,7 @@
- (void)clearSelection;
- (void)showOutline;
- (void)setupNotifications;
- (void)createGroup:(id)sender;
- (void)createEntry:(id)sender;

View File

@@ -43,7 +43,6 @@
_bindingEstablished = NO;
_outlineDelegate = [[MPOutlineViewDelegate alloc] init];
_datasource = [[MPOutlineDataSource alloc] init];
}
return self;
@@ -51,7 +50,6 @@
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
self.datasource = nil;
self.outlineDelegate = nil;
self.menu = nil;

View File

@@ -54,12 +54,12 @@
document.key = [self.keyfilePathControl URL];
document.password = [self.passwordTextField stringValue];
}
MPDocumentWindowController *mainWindowController = (MPDocumentWindowController *)[[[self view] window] windowController];
id mainWindowController = [[[self view] window] windowController];
[mainWindowController showEntries];
}
- (IBAction)_cancel:(id)sender {
MPDocumentWindowController *mainWindowController = (MPDocumentWindowController *)[[[self view] window] windowController];
id mainWindowController = [[[self view] window] windowController];
[mainWindowController showEntries];
}
@end

View File

@@ -134,9 +134,9 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
NSDictionary *imageDict = @{ MPToolbarItemLock: [NSImage imageNamed:NSImageNameLockUnlockedTemplate],
MPToolbarItemAddEntry: [MPIconHelper icon:MPIconPassword],
MPToolbarItemAddGroup: [MPIconHelper icon:MPIconPassword],
MPToolbarItemDelete: [NSImage imageNamed:NSImageNameRemoveTemplate],
MPToolbarItemDelete: [MPIconHelper icon:MPIconTrash],
MPToolbarItemAction: [NSImage imageNamed:NSImageNameActionTemplate],
MPToolbarItemInspector: [NSImage imageNamed:NSImageNameInfo],
MPToolbarItemInspector: [MPIconHelper icon:MPIconInfo],
};
return imageDict;
}

View File

@@ -44,11 +44,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>D06</string>
<string>216</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>

View File

@@ -56,10 +56,11 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{7, 5}, {32, 19}}</string>
<reference key="NSSuperview" ref="789399035"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="573415016">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags">-1543503872</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport">
@@ -85,6 +86,7 @@
</array>
<string key="NSFrameSize">{272, 30}</string>
<reference key="NSSuperview" ref="595437442"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="483226599"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">HNHGradientView</string>
@@ -103,6 +105,7 @@
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{272, 419}</string>
<reference key="NSSuperview" ref="100228705"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="352201595"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool>
@@ -217,6 +220,7 @@
</array>
<string key="NSFrameSize">{272, 419}</string>
<reference key="NSSuperview" ref="628894392"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="920491699"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
<reference key="NSDocView" ref="920491699"/>
@@ -228,6 +232,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 17}, {15, 102}}</string>
<reference key="NSSuperview" ref="628894392"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="578225175"/>
<string key="NSReuseIdentifierKey">_NS:15</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -240,6 +245,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 119}, {238, 15}}</string>
<reference key="NSSuperview" ref="628894392"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="789399035"/>
<string key="NSReuseIdentifierKey">_NS:60</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -251,6 +257,7 @@
</array>
<string key="NSFrame">{{0, 30}, {272, 419}}</string>
<reference key="NSSuperview" ref="595437442"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="100228705"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133680</int>
@@ -265,6 +272,7 @@
</array>
<string key="NSFrameSize">{272, 449}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="628894392"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
@@ -1120,7 +1128,72 @@
<nil key="sourceID"/>
<int key="maxID">433</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">HNHBadgedTextField</string>
<string key="superclassName">NSTextField</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/HNHBadgedTextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">HNHBadgedTextFieldCell</string>
<string key="superclassName">NSTextFieldCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/HNHBadgedTextFieldCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">HNHGradientView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/HNHGradientView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPOutlineViewController</string>
<string key="superclassName">MPViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="bottomBar">HNHGradientView</string>
<string key="outlineView">NSOutlineView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="bottomBar">
<string key="name">bottomBar</string>
<string key="candidateClassName">HNHGradientView</string>
</object>
<object class="IBToOneOutletInfo" key="outlineView">
<string key="name">outlineView</string>
<string key="candidateClassName">NSOutlineView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPOutlineViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPViewController</string>
<string key="superclassName">NSViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>