diff --git a/Tools/XcodeCapp/XcodeCapp/AppController.h b/Tools/XcodeCapp/XcodeCapp/AppController.h
index 95708702c..7278bd236 100644
--- a/Tools/XcodeCapp/XcodeCapp/AppController.h
+++ b/Tools/XcodeCapp/XcodeCapp/AppController.h
@@ -40,6 +40,7 @@
+ (AppController *)sharedAppController;
+- (IBAction)createProject:(id)sender;
- (IBAction)loadProject:(id)aSender;
- (IBAction)openHelp:(id)aSender;
- (IBAction)openAbout:(id)aSender;
diff --git a/Tools/XcodeCapp/XcodeCapp/AppController.m b/Tools/XcodeCapp/XcodeCapp/AppController.m
index aeb3d19b5..3586512c1 100644
--- a/Tools/XcodeCapp/XcodeCapp/AppController.m
+++ b/Tools/XcodeCapp/XcodeCapp/AppController.m
@@ -401,6 +401,25 @@ AppController *SharedAppControllerInstance = nil;
[self openWindow:self.preferencesWindow];
}
+- (IBAction)createProject:(id)sender
+{
+ NSSavePanel *savePanel = [NSSavePanel savePanel];
+ savePanel.title = @"Create a new Cappuccino Project";
+ savePanel.canCreateDirectories = YES;
+
+ if ([savePanel runModal] != NSFileHandlingPanelOKButton)
+ return;
+
+ NSString *projectPath = [[savePanel.URL path] stringByStandardizingPath];
+
+ NSDictionary *taskResult = [self.xcc createProject:projectPath];
+
+ if ([taskResult[@"status"] intValue])
+ return;
+
+ [self loadProjectAtPath:projectPath reopening:YES];
+}
+
#pragma mark - Delegates
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)app
@@ -439,6 +458,7 @@ AppController *SharedAppControllerInstance = nil;
#pragma mark - Private Helpers
+
- (BOOL)loadProjectAtPath:(NSString *)path reopening:(BOOL)reopen
{
if (!reopen && [self.xcc.projectPath isEqualToString:path])
diff --git a/Tools/XcodeCapp/XcodeCapp/XcodeCapp.h b/Tools/XcodeCapp/XcodeCapp/XcodeCapp.h
index 0e7e90c1a..a8ae9e3e7 100644
--- a/Tools/XcodeCapp/XcodeCapp/XcodeCapp.h
+++ b/Tools/XcodeCapp/XcodeCapp/XcodeCapp.h
@@ -134,6 +134,8 @@ extern NSString * const XCCProjectDidFinishLoadingNotification;
- (void)wantUserNotificationWithInfo:(NSDictionary *)info;
- (NSDictionary *)runTaskWithLaunchPath:(NSString *)launchPath arguments:(NSArray *)arguments returnType:(XCCTaskReturnType)returnType;
+- (NSDictionary*)createProject:(NSString*)aPath;
+
@end
@interface XcodeCapp (SnowLeopard)
diff --git a/Tools/XcodeCapp/XcodeCapp/XcodeCapp.m b/Tools/XcodeCapp/XcodeCapp/XcodeCapp.m
index 249482620..6ad288bc5 100644
--- a/Tools/XcodeCapp/XcodeCapp/XcodeCapp.m
+++ b/Tools/XcodeCapp/XcodeCapp/XcodeCapp.m
@@ -239,7 +239,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
// Make sure we are using jsc as the narwhal engine!
self.environment[@"NARWHAL_ENGINE"] = @"jsc";
- self.executables = @[@"python", @"narwhal-jsc", @"objj", @"nib2cib"];
+ self.executables = @[@"python", @"narwhal-jsc", @"objj", @"nib2cib", @"capp"];
}
- (void)initObservers
@@ -574,6 +574,37 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
[self openXcodeProject:self];
}
+- (NSDictionary*)createProject:(NSString*)aPath
+{
+ // This is used when an user wants to replace an existing project
+ NSArray *argumentsRemove = [NSArray arrayWithObjects:@"-rf", aPath, nil];
+ [self runTaskWithLaunchPath:@"/bin/rm" arguments:argumentsRemove returnType:kTaskReturnTypeAny];
+
+ // Don't know if we have to use the argument -l or not. In this case we should add $CAPP_BUILD in the taskEnv
+ NSArray *arguments = [NSArray arrayWithObjects:@"gen", aPath ,@"-t", @"NibApplication", nil];
+ NSDictionary *taskResult = [self runTaskWithLaunchPath:self.executablePaths[@"capp"]
+ arguments:arguments
+ returnType:kTaskReturnTypeStdOut];
+
+ NSInteger status = [taskResult[@"status"] intValue];
+ NSString *response = taskResult[@"response"];
+
+ if (!status)
+ {
+ DDLogVerbose(@"Created Xcode project: [%ld, %@]", status, status ? response : @"");
+ [self notifyUserWithTitle:@"Project created" message:aPath.lastPathComponent];
+ }
+ else
+ {
+ DDLogVerbose(@"Created Xcode project failed: [%ld, %@]", status, status ? response : @"");
+ NSDictionary *dictionary = [NSDictionary dictionaryWithObject:response forKey:@"message"];
+ [self.errorListController addObject:dictionary];
+ [self showErrors];
+ }
+
+ return taskResult;
+}
+
#pragma mark - Notification handlers
/*
diff --git a/Tools/XcodeCapp/XcodeCapp/en.lproj/MainMenu.xib b/Tools/XcodeCapp/XcodeCapp/en.lproj/MainMenu.xib
index b6fe97ddd..6bad9c7a7 100644
--- a/Tools/XcodeCapp/XcodeCapp/en.lproj/MainMenu.xib
+++ b/Tools/XcodeCapp/XcodeCapp/en.lproj/MainMenu.xib
@@ -1,2331 +1,439 @@
-
-
-
- 1060
- 12D78
- 3084
- 1187.37
- 626.00
-
- 3084
- 2053
-
-
- NSArrayController
- NSBox
- NSButton
- NSButtonCell
- NSCustomObject
- NSImageCell
- NSImageView
- NSMenu
- NSMenuItem
- NSPopUpButton
- NSPopUpButtonCell
- NSScrollView
- NSScroller
- NSTableColumn
- NSTableView
- NSTextField
- NSTextFieldCell
- NSUserDefaultsController
- NSView
- NSWindowTemplate
- PDFView
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.pdfkit.ibplugin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
-
- YES
- 3
-
- {11, 11}
- {10, 3}
- {15, 15}
- {128, 128}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ XcodeCapp 3 developed by:
+ Aparajita Fishman
+ aparajita@aparajita.com
+
+Original Cocoa version developed by:
+ Antoine Mercadal
+ antoine.mercadal@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ XcodeCapp %{value1}@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ openErrorInEditor:
+
+
+
+
+ openErrorInEditor:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ message
+ file
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file