nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 09:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed Search form toolbar and added field to search bar. Searching is broken for now.

Browse Source 
Added rudimentary add group/entry functionality
This commit is contained in:
michael starke
2013-03-10 03:12:34 +01:00
parent 816fb9f29e
commit ff7e8aaadd
15 changed files with 289 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
MacPass/MPEntryViewController.m
View File

@@ -53,7 +53,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
@property (retain) NSArrayController *entryArrayController;
@property (retain) NSArray *filteredEntries;
@property (retain) IBOutlet NSView *filterBar;
@property (retain) IBOutlet NSView *pathBar;
@property (assign) IBOutlet NSTableView *entryTable;
@property (assign) BOOL isStatusBarVisible;
@property (assign) IBOutlet NSLayoutConstraint *tableToTop;
@@ -64,6 +63,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
@property (assign) IBOutlet NSButton *filterUsernameButton;
@property (assign) IBOutlet NSButton *filterURLButton;
@property (assign) IBOutlet NSTextField *filterLabelTextField;
@property (assign) IBOutlet NSSearchField *filterSearchField;
@property (assign) KdbEntry *selectedEntry;
@@ -80,7 +80,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
- (BOOL)hasFilter;
- (void)updateFilter;
- (void)setupFilterBar;
- (void)setupPathBar;
- (void)_setupEntryMenu;
/* Notification handling */
- (void)_didChangeGroupSelectionInOutlineView:(NSNotification *)notification;
@@ -213,7 +212,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
#pragma mark Notifications
- (void)_didChangeGroupSelectionInOutlineView:(NSNotification *)notification {
if([self hasFilter]) {
[(MPMainWindowController *)[[self.view window] windowController] clearFilter:nil];
[self.filterSearchField setStringValue:@""];
}
MPOutlineViewDelegate *delegate = [notification object];
KdbGroup *group = delegate.selectedGroup;
@@ -230,6 +229,10 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
#pragma mark Filtering
- (void)showFilter:(id)sender {
[self _showFilterBarAnimated:NO];
}
- (BOOL)hasFilter {
return ([self.filter length] > 0);
}
@@ -246,7 +249,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
[self.entryTable deselectAll:nil];
}
- (void)clearFilter {
- (void)clearFilter:(id)sender {
self.filter = nil;
[[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:YES];
[self _hideStatusBarAnimated:YES];
@@ -295,14 +298,10 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
[[self.filterLabelTextField cell] setBackgroundStyle:NSBackgroundStyleRaised];
[self.filterDoneButton setAction:@selector(clearFilter:)];
[self.filterDoneButton setTarget:nil];
}
}
- (void)setupPathBar {
if(!self.pathBar) {
[[NSBundle mainBundle] loadNibNamed:@"PathBar" owner:self topLevelObjects:nil];
[self.pathBar setAutoresizingMask:NSViewWidthSizable|NSViewMaxYMargin];
[self.filterSearchField setAction:@selector(updateFilter:)];
[[self.filterSearchField cell] setSendsSearchStringImmediately:NO];
}
}