From e974f165a2cede20d242ee0b6bf112e6df98970a Mon Sep 17 00:00:00 2001
From: Allan Odgaard <git@abetarda.com>
Date: Thu, 21 Feb 2013 22:08:52 +0100
Subject: [PATCH] Add newFolder: forwarding to document controller

---
 Frameworks/DocumentWindow/src/DocumentController.h  | 2 ++
 Frameworks/DocumentWindow/src/DocumentController.mm | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Frameworks/DocumentWindow/src/DocumentController.h b/Frameworks/DocumentWindow/src/DocumentController.h
index 1fb180a4..568c67ac 100644
--- a/Frameworks/DocumentWindow/src/DocumentController.h
+++ b/Frameworks/DocumentWindow/src/DocumentController.h
@@ -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
 
diff --git a/Frameworks/DocumentWindow/src/DocumentController.mm b/Frameworks/DocumentWindow/src/DocumentController.mm
index a88f9c7c..ba0f5531 100644
--- a/Frameworks/DocumentWindow/src/DocumentController.mm
+++ b/Frameworks/DocumentWindow/src/DocumentController.mm
@@ -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:))