diff --git a/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.h b/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.h index ef8d0919..2ca088aa 100644 --- a/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.h +++ b/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.h @@ -25,7 +25,7 @@ @property (nonatomic, retain) NSArray* openURLs; @property (nonatomic, retain) NSArray* modifiedURLs; -- (void)selectURLs:(NSArray*)someURLs byExpandingAncestors:(BOOL)expandAncestors; +- (void)selectURLs:(NSArray*)someURLs expandChildren:(BOOL)expandAncestors; - (void)editURL:(NSURL*)anURL; - (void)scrollToOffset:(CGFloat)anOffset; @end diff --git a/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm b/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm index 6028c205..dc166a48 100644 --- a/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm +++ b/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm @@ -252,7 +252,7 @@ static NSSet* VisibleItems (NSOutlineView* outlineView, FSItem* root, NSMutableS self.pendingExpandURLs = nil; } -- (void)selectURLs:(NSArray*)someURLs byExpandingAncestors:(BOOL)expandAncestors +- (void)selectURLs:(NSArray*)someURLs expandChildren:(BOOL)expandAncestors { self.pendingSelectURLs = [NSSet setWithArray:someURLs]; if([someURLs count] == 1) diff --git a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm index 1eda46aa..5a2683d9 100644 --- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm +++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm @@ -263,7 +263,7 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot [self goToURL:isChild ? parentURL : ParentForURL(aURL)]; } - [_outlineViewDelegate selectURLs:@[ aURL ] byExpandingAncestors:YES]; + [_outlineViewDelegate selectURLs:@[ aURL ] expandChildren:YES]; } - (NSString*)path @@ -522,7 +522,7 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot OakPlayUISound(OakSoundDidMoveItemUISound); if([duplicatedURLs count] == 1) [_outlineViewDelegate editURL:[duplicatedURLs lastObject]]; - else [_outlineViewDelegate selectURLs:duplicatedURLs byExpandingAncestors:NO]; + else [_outlineViewDelegate selectURLs:duplicatedURLs expandChildren:NO]; } } @@ -533,7 +533,7 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot if([item.target isFileURL]) { [self goToURL:ParentForURL(item.target)]; - [_outlineViewDelegate selectURLs:@[ item.target ] byExpandingAncestors:NO]; + [_outlineViewDelegate selectURLs:@[ item.target ] expandChildren:NO]; return; } } @@ -667,7 +667,7 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot if([created count] > 0) { OakPlayUISound(OakSoundDidMoveItemUISound); - [_outlineViewDelegate selectURLs:created byExpandingAncestors:NO]; + [_outlineViewDelegate selectURLs:created expandChildren:NO]; } }