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

Add newFolder: forwarding to document controller

Browse Source
This commit is contained in:
Allan Odgaard
2013-02-21 22:08:52 +01:00
parent 5e24b8554c
commit e974f165a2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/DocumentWindow/src/DocumentController.h
View File

@@ -27,7 +27,9 @@ PUBLIC @interface DocumentController : NSObject
- (void)openAndSelectDocument:(document::document_ptr const&)aDocument;
- (void)close;
- (IBAction)newFolder:(id)sender;
- (IBAction)newDocumentInTab:(id)sender;
- (IBAction)newDocumentInDirectory:(id)sender;
- (IBAction)moveDocumentToNewWindow:(id)sender; // TODO Move to AppController
- (IBAction)mergeAllWindows:(id)sender; // TODO Move to AppController

9
Frameworks/DocumentWindow/src/DocumentController.mm
View File

@@ -1576,6 +1576,7 @@ namespace
- (CGFloat)fileBrowserWidth { return self.layoutView.fileBrowserWidth; }
- (void)setFileBrowserWidth:(CGFloat)aWidth { self.layoutView.fileBrowserWidth = aWidth; }
- (IBAction)newFolder:(id)sender { if(self.fileBrowser) [NSApp sendAction:_cmd to:self.fileBrowser from:sender]; }
- (IBAction)reload:(id)sender { if(self.fileBrowser) [NSApp sendAction:_cmd to:self.fileBrowser from:sender]; }
- (IBAction)deselectAll:(id)sender { if(self.fileBrowser) [NSApp sendAction:_cmd to:self.fileBrowser from:sender]; }
@@ -1907,7 +1908,7 @@ namespace
// = NSMenuValidation =
// ====================
- (BOOL)validateMenuItem:(NSMenuItem*)menuItem;
- (BOOL)validateMenuItem:(NSMenuItem*)menuItem
{
BOOL active = YES;
if([menuItem action] == @selector(toggleFileBrowser:))
@@ -1919,14 +1920,12 @@ namespace
}
else if([menuItem action] == @selector(newDocumentInDirectory:))
active = self.fileBrowserVisible && [self.fileBrowser directoryForNewItems] != nil;
else if([menuItem action] == @selector(newFolder:) || [menuItem action] == @selector(goBack:) || [menuItem action] == @selector(goForward:))
active = self.fileBrowserVisible && [self.fileBrowser validateMenuItem:menuItem];
else if([menuItem action] == @selector(moveDocumentToNewWindow:))
active = _documents.size() > 1;
else if([menuItem action] == @selector(selectNextTab:) || [menuItem action] == @selector(selectPreviousTab:))
active = _documents.size() > 1;
else if([menuItem action] == @selector(goBack:))
active = self.fileBrowser.canGoBack;
else if([menuItem action] == @selector(goForward:))
active = self.fileBrowser.canGoForward;
else if([menuItem action] == @selector(revealFileInProject:) || [menuItem action] == @selector(revealFileInProjectByExpandingAncestors:))
active = _selectedDocument && _selectedDocument->path() != NULL_STR;
else if([menuItem action] == @selector(goToProjectFolder:))