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

Display of selected filters now works correctly

Browse Source
This commit is contained in:
Michael Starke
2018-08-23 22:37:38 +02:00
parent eb8c5c4749
commit d902aa893c
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MacPass/MPContextBarViewController.m
View File

@@ -41,6 +41,9 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
@interface MPContextBarViewController () @interface MPContextBarViewController ()
@property (strong) NSString *selectMenuItemTitle;
@property (strong) NSString *multipleMenuItemTitle;
@property (nonatomic, assign) MPContextTab activeTab; @property (nonatomic, assign) MPContextTab activeTab;
/* Filter */ /* Filter */
@@ -70,8 +73,9 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
} }
- (void)awakeFromNib { - (void)awakeFromNib {
self.selectMenuItemTitle = NSLocalizedString(@"SELECT_FILTER_WITH_DOTS", "Menu displayed as popup selection for search options if no filter is selected");
self.multipleMenuItemTitle = NSLocalizedString(@"MULTIPLE_FILTERS_ACTIVE_WITH_DOTS", "Menu displayed as popup selection for search options when multiple items are selected");
self.filterLabelTextField.cell.backgroundStyle = NSBackgroundStyleRaised; self.filterLabelTextField.cell.backgroundStyle = NSBackgroundStyleRaised;
//self.historyBar.activeGradient = [[NSGradient alloc] initWithStartingColor:[[NSColor orangeColor] shadowWithLevel:0.2] endingColor:[[NSColor orangeColor] highlightWithLevel:0.2]];
/* Setup Trash Bar color */ /* Setup Trash Bar color */
if(!HNHUIIsRunningOnYosemiteOrNewer()) { if(!HNHUIIsRunningOnYosemiteOrNewer()) {
@@ -94,11 +98,10 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
NSInteger specialTags[] = { MPEntrySearchDoublePasswords, MPEntrySearchExpiredEntries }; NSInteger specialTags[] = { MPEntrySearchDoublePasswords, MPEntrySearchExpiredEntries };
NSArray *titles = @[ NSLocalizedString(@"SEARCH_DUPLICATE_PASSWORDS", "Search option: Find duplicate passwords"), NSLocalizedString(@"SEARCH_EXPIRED_ENTRIES", "Search option: Find expired entries") ]; NSArray *titles = @[ NSLocalizedString(@"SEARCH_DUPLICATE_PASSWORDS", "Search option: Find duplicate passwords"), NSLocalizedString(@"SEARCH_EXPIRED_ENTRIES", "Search option: Find expired entries") ];
NSMenu *specialMenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"CUSTOM_SEARCH_FILTER_MENU", @"Title for menu for custom search filters")]; NSMenu *specialMenu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"CUSTOM_SEARCH_FILTER_MENU", @"Title for menu for custom search filters")];
[specialMenu addItemWithTitle:NSLocalizedString(@"SELECT_FILTER_WITH_DOTS", "Menu displayed as popup selection for search options") action:NULL keyEquivalent:@""]; [specialMenu addItemWithTitle:self.selectMenuItemTitle action:NULL keyEquivalent:@""];
NSMenuItem *selectItem = specialMenu.itemArray.firstObject; NSMenuItem *selectItem = specialMenu.itemArray.firstObject;
selectItem.enabled = NO; selectItem.enabled = NO;
selectItem.tag = MPEntrySearchNone; selectItem.tag = MPEntrySearchNone;
selectItem.action = @selector(toggleSearchFlags:);
for(NSInteger iIndex = 0; iIndex < (sizeof(specialTags)/sizeof(NSInteger)); iIndex++) { for(NSInteger iIndex = 0; iIndex < (sizeof(specialTags)/sizeof(NSInteger)); iIndex++) {
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:titles[iIndex] action:@selector(toggleSearchFlags:) keyEquivalent:@""]; NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:titles[iIndex] action:@selector(toggleSearchFlags:) keyEquivalent:@""];
item.tag = specialTags[iIndex]; item.tag = specialTags[iIndex];
@@ -183,8 +186,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
self.urlButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUrls, currentFlags)); self.urlButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUrls, currentFlags));
self.usernameButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUsernames, currentFlags)); self.usernameButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchUsernames, currentFlags));
self.everywhereButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchAllAttributes, currentFlags)); self.everywhereButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchAllAttributes, currentFlags));
NSInteger selectedTag = MPEntrySearchNone; NSMutableSet *activeTags = [[NSMutableSet alloc] init];
NSMutableSet *selectedTags = [[NSMutableSet alloc] init];
for(NSMenuItem *item in self.specialFilterPopUpButton.menu.itemArray) { for(NSMenuItem *item in self.specialFilterPopUpButton.menu.itemArray) {
MPEntrySearchFlags flag = item.tag; MPEntrySearchFlags flag = item.tag;
if(flag == MPEntrySearchNone) { if(flag == MPEntrySearchNone) {
@@ -195,13 +197,24 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
BOOL isActive = MPIsFlagSetInOptions(flag, currentFlags); BOOL isActive = MPIsFlagSetInOptions(flag, currentFlags);
if(isActive) { if(isActive) {
[selectedTags addObject:@(flag)]; [activeTags addObject:@(flag)];
selectedTag = flag;
} }
item.state = HNHUIStateForBool(isActive); item.state = HNHUIStateForBool(isActive);
} }
if(selectedTags.count == 1) { NSMenuItem *item = [self.specialFilterPopUpButton.menu itemWithTag:MPEntrySearchNone];
[self.specialFilterPopUpButton selectItemWithTag:selectedTag]; if(activeTags.count > 1) {
item.title = self.multipleMenuItemTitle;
[self.specialFilterPopUpButton selectItemWithTag:MPEntrySearchNone];
}
else {
item.title = self.selectMenuItemTitle;
if(activeTags.count == 1) {
NSInteger tag = [activeTags.anyObject integerValue];
[self.specialFilterPopUpButton selectItemWithTag:tag];
}
else {
[self.specialFilterPopUpButton selectItemWithTag:MPEntrySearchNone];
}
} }
} }

6
MacPass/MPDocument+Search.m
View File

@@ -96,15 +96,15 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
NSAssert([sender isKindOfClass:NSMenuItem.class], @"Internal inconsitency. Did expect NSMenuItem expected, but got %@", [sender class]); NSAssert([sender isKindOfClass:NSMenuItem.class], @"Internal inconsitency. Did expect NSMenuItem expected, but got %@", [sender class]);
state = ((NSMenuItem *)sender).state; state = ((NSMenuItem *)sender).state;
/* Manually toggle the state since the popupbuttoncell doesn't do it like we want it to */ /* Manually toggle the state since the popupbuttoncell doesn't do it like we want it to */
state = state == NSControlStateValueOn ? NSControlStateValueOff : NSControlStateValueOn; state = state == NSOnState ? NSOffState : NSOnState;
} }
switch(state) { switch(state) {
case NSControlStateValueOff: case NSOffState:
toggleFlag ^= MPEntrySearchAllCombineableFlags; toggleFlag ^= MPEntrySearchAllCombineableFlags;
newFlags = isSingleFlag ? MPEntrySearchNone : (self.searchContext.searchFlags & toggleFlag); newFlags = isSingleFlag ? MPEntrySearchNone : (self.searchContext.searchFlags & toggleFlag);
break; break;
case NSControlStateValueOn: case NSOnState:
if(isSingleFlag ) { if(isSingleFlag ) {
newFlags = toggleFlag; // This has to be either expired or double passwords newFlags = toggleFlag; // This has to be either expired or double passwords
} }