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

Switchted to NSStackView for search options. This raises the deployment target to 10.11.

Browse Source
This commit is contained in:
Michael Starke
2018-08-17 15:43:38 +02:00
parent 27d1f512f0
commit 36e6472822
3 changed files with 157 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
MacPass/MPContextBarViewController.m
View File

@@ -134,21 +134,40 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
}
}
/*
- (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector {
if(commandSelector == @selector(insertNewline:)) {
[self _didChangeFilter];
}
return NO;
}
*/
- (void)stackView:(NSStackView *)stackView willDetachViews:(NSArray<NSView *> *)views {
for(NSView *view in views) {
if([view isKindOfClass:NSButton.class]) {
NSButton *button = (NSButton *)view;
NSMenuItem *item = [self.specialFilterPopUpButton.menu itemWithTag:button.tag];
if(item) {
return; // no duplicates
}
item = [self _menuItemForButton:button];
if(item) {
[self.specialFilterPopUpButton.menu addItem:item];
}
}
}
[self _updateFilterButtons];
}
- (void)stackView:(NSStackView *)stackView didReattachViews:(NSArray<NSView *> *)views {
for(NSView *view in views) {
if([view isKindOfClass:NSButton.class]) {
NSButton *button = (NSButton *)view;
NSMenuItem *item = [self.specialFilterPopUpButton.menu itemWithTag:button.tag];
if(item) {
[self.specialFilterPopUpButton.menu removeItem:item];
}
}
}
[self _updateFilterButtons];
}
#pragma mark UI Helper
- (void)_updateFilterButtons {
MPDocument *document = self.windowController.document;
MPEntrySearchFlags currentFlags = document.searchContext.searchFlags;
self.duplicatePasswordsButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, currentFlags));
self.notesButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchNotes, currentFlags));
self.passwordButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchPasswords, currentFlags));
self.titleButton.state = HNHUIStateForBool(MPIsFlagSetInOptions(MPEntrySearchTitles, currentFlags));
@@ -173,4 +192,10 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
[self.specialFilterPopUpButton selectItemWithTag:selectedTag];
}
- (NSMenuItem *)_menuItemForButton:(NSButton *)button {
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:button.title action:@selector(toggleSearchFlags:) keyEquivalent:@""];
item.tag = button.tag;
return item;
}
@end