github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-22 13:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

When in Favorites folder, change Add → Remove From Favorites

Browse Source 
In practice it is possible to be in a parent of the Favorites folder and expand items so that the symbolic links in favorites can be selected, this commit does not handle that case, as we would then also need to handle the case where items both inside and outside the Favorites folder were selected (at the same time).

Users who do these things are probably aware of how symbolic links work, and can use “Move to Trash”.

Closes #1089
This commit is contained in:
Allan Odgaard
2013-08-26 11:48:41 +02:00
parent 62db7aff11
commit 211770893e
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Frameworks/OakFileBrowser/src/OakFileBrowser.mm
View File

@@ -773,6 +773,12 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
}
}
- (void)removeSelectedEntriesFromFavorites:(id)sender
{
for(NSURL* url in self.selectedURLs)
[[OakFileManager sharedInstance] trashItemAtURL:url window:_view.window];
}
- (IBAction)cut:(id)sender
{
NSPasteboard* pboard = [NSPasteboard generalPasteboard];
@@ -888,7 +894,8 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
if(rootPath || hasFileSelected)
{
[aMenu addItem:[NSMenuItem separatorItem]];
if(hasFileSelected || to_s(rootPath) != oak::application_t::support("Favorites"))
[aMenu addItem:[NSMenuItem separatorItem]];
if(hasFileSelected)
{
@@ -897,7 +904,15 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
[aMenu addItemWithTitle:@"Quick Look" action:@selector(toggleQuickLookPreview:) keyEquivalent:@""];
}
[aMenu addItemWithTitle:@"Add to Favorites" action:@selector(addSelectedEntriesToFavorites:) keyEquivalent:@""];
if(rootPath && to_s(rootPath) == oak::application_t::support("Favorites"))
{
if(hasFileSelected)
[aMenu addItemWithTitle:@"Remove From Favorites" action:@selector(removeSelectedEntriesFromFavorites:) keyEquivalent:@""];
}
else
{
[aMenu addItemWithTitle:@"Add to Favorites" action:@selector(addSelectedEntriesToFavorites:) keyEquivalent:@""];
}
}
if(hasFileSelected)
@@ -1225,11 +1240,12 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
struct { NSString* format; SEL action; } const menuTitles[] =
{
{ @"Cut%@", @selector(cut:) },
{ @"Copy%@", @selector(copy:) },
{ quickLookTitle, @selector(toggleQuickLookPreview:) },
{ @"Show%@ in Finder", @selector(showSelectedEntriesInFinder:) },
{ @"Add%@ to Favorites", @selector(addSelectedEntriesToFavorites:) },
{ @"Cut%@", @selector(cut:) },
{ @"Copy%@", @selector(copy:) },
{ quickLookTitle, @selector(toggleQuickLookPreview:) },
{ @"Show%@ in Finder", @selector(showSelectedEntriesInFinder:) },
{ @"Add%@ to Favorites", @selector(addSelectedEntriesToFavorites:) },
{ @"Remove%@ From Favorites", @selector(removeSelectedEntriesFromFavorites:) },
};
for(auto info : menuTitles)