Skip to content

Prevent user-disabled objects from appearing #1688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjrobertson merged 3 commits into from
Dec 2, 2013
Merged

Prevent user-disabled objects from appearing #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b9b5b2
new method to return entry contents without user-disabled objects
skurfer Nov 22, 2013
c25e04d
prevent user-disabled objects from appearing in the UI
skurfer Nov 22, 2013
8f36969
Merge branch 'master' into omitted
skurfer Nov 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Quicksilver/Code-QuickStepCore/QSCatalogEntry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
- (NSArray *)contents;
- (NSArray *)contentsScanIfNeeded:(BOOL)canScan;
- (void)setContents:(NSArray *)newContents;
- (NSArray *)enabledContents;
- (NSIndexPath *)catalogIndexPath;
- (NSMutableDictionary *)info;
- (QSCatalogEntry *)uniqueCopy;
Expand Down
9 changes: 8 additions & 1 deletion Quicksilver/Code-QuickStepCore/QSCatalogEntry.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ - (NSUInteger)deepObjectCount {
NSArray *leaves = [self deepChildrenWithGroups:NO leaves:YES disabled:NO];
NSUInteger i, count = 0;
for (i = 0; i < [leaves count]; i++)
count += [(NSArray *)[[leaves objectAtIndex:i] contents] count];
count += [(NSArray *)[[leaves objectAtIndex:i] enabledContents] count];
return count;
}

Expand Down Expand Up @@ -612,6 +612,13 @@ - (NSArray *)contentsScanIfNeeded:(BOOL)canScan {
}
}

- (NSArray *)enabledContents
{
NSIndexSet *enabled = [[self contents] indexesOfObjectsWithOptions:NSEnumerationConcurrent passingTest:^BOOL(QSObject *obj, NSUInteger idx, BOOL *stop) {
return ![QSLib itemIsOmitted:obj];
}];
return [[self contents] objectsAtIndexes:enabled];
}

- (QSCatalogEntry *)uniqueCopy {
NSMutableDictionary *newDictionary = [info mutableCopy];
Expand Down
2 changes: 1 addition & 1 deletion Quicksilver/Code-QuickStepCore/QSComputerSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ - (NSString*)detailsOfObject:(QSObject*)object {

- (BOOL)loadChildrenForObject:(QSObject*)proxy {
if ([[proxy identifier] isEqualToString:@"QSComputerProxy"]) {
[proxy setChildren:[[[QSLibrarian sharedInstance] entryForID:@"QSPresetVolumes"] contents]];
[proxy setChildren:[[QSLib entryForID:@"QSPresetVolumes"] enabledContents]];
return YES;
}
return NO;
Expand Down
2 changes: 1 addition & 1 deletion Quicksilver/Code-QuickStepCore/QSLibrarian.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ - (void)recalculateTypeArraysForItem:(QSCatalogEntry *)entry {
//NSDate *date = [NSDate date];

NSString *currentItemID = [entry identifier];
NSDictionary *typeDictionary = [self typeArraysFromArray:[entry contents]];
NSDictionary *typeDictionary = [self typeArraysFromArray:[entry enabledContents]];

//NSLog(@"%@", [typeDictionary allKeys]);
NSArray *typeKeys = [typeDictionary allKeys];
Expand Down
4 changes: 2 additions & 2 deletions Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSCatalogEntrySource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ - (NSArray *)childrenForObject:(QSBasicObject *)object {
QSCatalogEntry *theEntry = [[QSLibrarian sharedInstance] entryForID:[object objectForType:QSCatalogEntryPboardType]];

if ([theEntry isGroup])
return [self objectsFromCatalogEntries:[theEntry contents]];
return [self objectsFromCatalogEntries:[theEntry enabledContents]];
else
return [theEntry contentsScanIfNeeded:YES];
return [theEntry enabledContents];
}

// Action Provider Methods
Expand Down