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

Placing search in the Toolbar again

Browse Source
This commit is contained in:
michael starke
2014-02-23 21:17:14 +01:00
parent 1122cfbbde
commit c084d49d95
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MacPass/MPToolbarDelegate.m
View File

@@ -36,6 +36,7 @@ NSString *const MPToolbarItemAddEntry = @"TOOLBAR_ADD_ENTRY";
NSString *const MPToolbarItemDelete =@"TOOLBAR_DELETE";
NSString *const MPToolbarItemAction = @"TOOLBAR_ACTION";
NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
NSString *const MPToolbarItemSearch = @"TOOLBAR_SEARCH";
@interface MPToolbarDelegate() {
MPAddEntryContextMenuDelegate *_entryMenuDelegate;
@@ -56,7 +57,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
- (id)init {
self = [super init];
if (self) {
_toolbarIdentifiers = @[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, MPToolbarItemLock, MPToolbarItemInspector ];
_toolbarIdentifiers = @[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, MPToolbarItemSearch, MPToolbarItemLock, MPToolbarItemInspector ];
_toolbarImages = [self createToolbarImages];
_toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]];
_entryMenuDelegate = [[MPAddEntryContextMenuDelegate alloc] init];
@@ -126,6 +127,11 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
[item setMenuFormRepresentation:menuRepresentation];
}
else if( [itemIdentifier isEqualToString:MPToolbarItemSearch]){
NSSearchField *searchField = [[NSSearchField alloc] init];
[searchField setAction:@selector(performFindPanelAction:)];
[item setView:searchField];
}
else {
NSButton *button = [[MPToolbarButton alloc] initWithFrame:NSMakeRect(0, 0, 32, 32)];
NSImage *image = self.toolbarImages[itemIdentifier];
@@ -152,8 +158,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
return self.toolbarIdentifiers;
}
- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar
{
- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar {
return self.toolbarIdentifiers;
}
@@ -169,23 +174,32 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
}
- (NSString *)_localizedLabelForToolbarItemIdentifier:(NSString *)identifier {
NSDictionary *labelDict = @{ MPToolbarItemLock: NSLocalizedString(@"LOCK", @""),
static NSDictionary *labelDict;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
labelDict = @{ MPToolbarItemLock: NSLocalizedString(@"LOCK", @""),
MPToolbarItemAction: NSLocalizedString(@"ACTION", @""),
MPToolbarItemAddEntry: NSLocalizedString(@"ADD_ENTRY", @""),
MPToolbarItemAddGroup: NSLocalizedString(@"ADD_GROUP", @""),
MPToolbarItemDelete: NSLocalizedString(@"DELETE", @""),
MPToolbarItemInspector: NSLocalizedString(@"INSPECTOR", @"")
MPToolbarItemInspector: NSLocalizedString(@"INSPECTOR", @""),
MPToolbarItemSearch: NSLocalizedString(@"SEARCH", @"")
};
});
return labelDict[identifier];
}
- (SEL)_actionForToolbarItemIdentifier:(NSString *)identifier {
NSDictionary *actionDict = @{ MPToolbarItemLock: @(MPActionLock),
static NSDictionary *actionDict;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
actionDict = @{ MPToolbarItemLock: @(MPActionLock),
MPToolbarItemAddEntry: @(MPActionAddEntry),
MPToolbarItemAddGroup: @(MPActionAddGroup),
MPToolbarItemDelete: @(MPActionDelete),
MPToolbarItemInspector: @(MPActionToggleInspector)
};
});
MPActionType actionType = (MPActionType)[actionDict[identifier] integerValue];
return [MPActionHelper actionOfType:actionType];
}