typo and note about GNUstep version added

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@7816 72102866-910b-0410-8b05-ffd578937521

INSTALL

@@ -10,8 +10,10 @@ notice and permission notice.
 Installing `ProjectCenter'
 ====================
 
-ProjectCenter requires GNUstep to be installed. MAke sure that you have an
-up to date version on your system installed!
+ProjectCenter requires GNUstep to be installed. Make sure that you have an
+up to date version on your system installed! In order to use apps built with
+ProjectCenter, you will need at least a version not older than from October 
+2000.
 
 Here is a quick-and-dirty example of installation commands:
 

PCLib/PCBrowserController.m

@@ -59,6 +59,11 @@ NSString *FileShouldOpenNotification = @"FileShouldOpenNotification";
     else if ([ctitle isEqualToString:@"Other Sources"]) {
       NSString *f = [NSString stringWithContentsOfFile:ctitlef];
 
+      [project editSelectedFile:f];
+    }
+    else if ([ctitle isEqualToString:@"Other Resources"]) {
+      NSString *f = [NSString stringWithContentsOfFile:ctitlef];
+
       [project editSelectedFile:f];
     }
   }

PCLib/PCProject.m

@@ -782,7 +782,7 @@
 - (void)windowWillClose:(NSNotification *)aNotification
 {
   id object = [aNotification object];
-
+  
   if (object == buildTargetPanel) {
   }
   else if (object == [self projectWindow]) {

PCLib/PCProjectBuilder.h

@@ -36,6 +36,7 @@
   NSWindow *buildWindow;
 
   NSTextView *logOutput;
+  NSTextView *errorOutput;
 
   NSMutableDictionary *buildTasks;
   NSString *makePath;
@@ -55,8 +56,8 @@
 - (void)showPanelWithProject:(PCProject *)proj options:(NSDictionary *)options;
 
 - (void)build:(id)sender;
-- (void)clean:(id)sender;
-- (void)install:(id)sender;
+
+- (void)logData:(NSNotification *)aNotif;
 
 - (void)projectDidChange:(NSNotification *)aNotif;
 

PCLib/PCProjectBuilder.m

@@ -46,7 +46,6 @@
   NSSplitView *split;
   NSScrollView *scrollView1; 
   NSScrollView *scrollView2; 
-  NSTextView *textView2;
   NSMatrix* matrix;
   NSRect _w_frame;
   NSButtonCell* buttonCell = [[[NSButtonCell alloc] init] autorelease];
@@ -66,6 +65,7 @@
   [buildWindow setDelegate:self];
   [buildWindow setReleasedWhenClosed:NO];
   [buildWindow setMinSize:NSMakeSize(512,320)];
+  [buildWindow setFrameAutosaveName:@"Builder"];
 
   logOutput = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,472,88)];
   [logOutput setMaxSize:NSMakeSize(1e7, 1e7)];
@@ -89,18 +89,18 @@
    *
    */
 
-  textView2 = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,472,88)];
-  [textView2 setMaxSize:NSMakeSize(1e7, 1e7)];
-  [textView2 setVerticallyResizable:YES];
-  [textView2 setHorizontallyResizable:NO];
-  [textView2 setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
-  [textView2 setBackgroundColor:[NSColor whiteColor]];
-  [[textView2 textContainer] setWidthTracksTextView:YES];
+  errorOutput = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,472,88)];
+  [errorOutput setMaxSize:NSMakeSize(1e7, 1e7)];
+  [errorOutput setVerticallyResizable:YES];
+  [errorOutput setHorizontallyResizable:NO];
+  [errorOutput setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+  [errorOutput setBackgroundColor:[NSColor whiteColor]];
+  [[errorOutput textContainer] setWidthTracksTextView:YES];
 
   scrollView2 = [[NSScrollView alloc] initWithFrame:NSMakeRect (0,0,496,92)];
-  [scrollView2 setDocumentView:textView2];
-  [textView2 setMinSize:NSMakeSize(0.0,[scrollView2 contentSize].height)];
-  [[textView2 textContainer] setContainerSize:NSMakeSize([scrollView2 contentSize].width,1e7)];
+  [scrollView2 setDocumentView:errorOutput];
+  [errorOutput setMinSize:NSMakeSize(0.0,[scrollView2 contentSize].height)];
+  [[errorOutput textContainer] setContainerSize:NSMakeSize([scrollView2 contentSize].width,1e7)];
   [scrollView2 setHasHorizontalScroller:NO];
   [scrollView2 setHasVerticalScroller:YES];
   [scrollView2 setBorderType: NSBezelBorder];
@@ -265,7 +265,7 @@ static PCProjectBuilder *_builder;
 - (void)showPanelWithProject:(PCProject *)proj options:(NSDictionary *)options;
 {
   if (![buildWindow isVisible]) {
-    [buildWindow center];
+    [buildWindow setFrameUsingName:@"Builder"];
   }
   [buildWindow makeKeyAndOrderFront:self];
 
@@ -282,16 +282,24 @@ static PCProjectBuilder *_builder;
   NSMutableArray *args;
   NSString *output = nil;
   NSPipe *logPipe;
+  NSPipe *errorPipe;
   NSFileHandle *readHandle;
+  NSFileHandle *errorReadHandle;
   NSData  *inData = nil;
   NSDictionary *optionDict;
+  NSString *status;
+  NSString *target;
 
   if (!currentProject) {
     return;
   }
 
   logPipe = [NSPipe pipe];
+  errorPipe = [NSPipe pipe];
+
   readHandle = [logPipe fileHandleForReading];
+  errorReadHandle = [errorPipe fileHandleForReading];
+
   makeTask = [[NSTask alloc] init];
 
   optionDict = [currentProject buildOptions];
@@ -299,35 +307,62 @@ static PCProjectBuilder *_builder;
 
   switch ([[sender selectedCell] tag]) {
   case 0:
+    status = [NSString stringWithString:@"Building..."];
+    target = [NSString stringWithString:@"Default"];
     break;
   case 1:
+    if (NSRunAlertPanel(@"Clean Project?",@"Really clean %@?",@"Yes",@"No",nil,[currentProject projectName]) == NSAlertAlternateReturn) {
+      return;
+    }
+    status = [NSString stringWithString:@"Cleaning..."];
+    target = [NSString stringWithString:@"Clean"];
     [args addObject:@"clean"];
     break;
   case 2:
+    status = [NSString stringWithString:@"Building..."];
+    target = [NSString stringWithString:@"Debug"];
     [args addObject:@"debug=yes"];
     break;
   case 3:
+    status = [NSString stringWithString:@"Building..."];
+    target = [NSString stringWithString:@"Profile"];
     [args addObject:@"profile=yes"];
     [args addObject:@"static=yes"];
     break;
   case 4:
+    status = [NSString stringWithString:@"Installing..."];
+    target = [NSString stringWithString:@"Install"];
     [args addObject:@"install"];
     break;
   }
 
-  [makeTask setArguments:args];
+  [buildStatusField setStringValue:status];  
+  [targetField setStringValue:target];  
 
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(logData:) name:NSFileHandleReadCompletionNotification object:nil];
+  
+  [makeTask setArguments:args];
+  
   [makeTask setCurrentDirectoryPath:[currentProject projectPath]];
   [makeTask setLaunchPath:makePath];
   
   [makeTask setStandardOutput:logPipe];
-  [makeTask setStandardError:logPipe];
+  [makeTask setStandardError:errorPipe];
   
   [makeTask launch];
   
   /*
    * This is just a quick hack for now...
    */
+
+  /*
+  [logOutput setString:@""];
+  [logOutput scrollRangeToVisible:NSMakeRange([[logOutput textStorage] length], 0)];
+  [errorOutput setString:@""];
+  [errorOutput scrollRangeToVisible:NSMakeRange([[errorOutput textStorage] length], 0)];
+
+  [readHandle readInBackgroundAndNotify];
+  */
   
   while ((inData = [readHandle availableData]) && [inData length]) {
     output = [[NSString alloc] initWithData:inData encoding:NSASCIIStringEncoding];      
@@ -335,17 +370,25 @@ static PCProjectBuilder *_builder;
     [logOutput scrollRangeToVisible:NSMakeRange([[logOutput textStorage] length], 0)];
     [output release];
   }
-  
+
   [makeTask waitUntilExit];
+
+  [buildStatusField setStringValue:@"Waiting..."];  
+  [targetField setStringValue:@""];  
+
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:NSFileHandleReadCompletionNotification object:nil];
+
   [makeTask autorelease];
 }
 
-- (void)clean:(id)sender
+- (void)logData:(NSNotification *)aNotif
 {
-}
+  NSData *data = [[aNotif userInfo] objectForKey:NSFileHandleNotificationDataItem];
+  NSString *output = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];      
 
-- (void)install:(id)sender
-{
+  [logOutput setString:[NSString stringWithFormat:@"%@%@\n", [logOutput string], output]];
+  [logOutput scrollRangeToVisible:NSMakeRange([[logOutput textStorage] length], 0)];
+  [output release];
 }
 
 - (void)projectDidChange:(NSNotification *)aNotif

PCLib/PCProjectManager.m

@@ -61,6 +61,8 @@ NSString *ActiveProjectDidChangeNotification = @"ActiveProjectDidChange";
                                               defer:NO];
   [inspector setMinSize:NSMakeSize(280,384)];
   [inspector setTitle:@"Inspector"];
+  [inspector setReleasedWhenClosed:NO];
+  [inspector setFrameAutosaveName:@"Inspector"];
   _c_view = [inspector contentView];
 
   inspectorPopup = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(80,352,128,20)];
@@ -71,12 +73,12 @@ NSString *ActiveProjectDidChangeNotification = @"ActiveProjectDidChange";
 
   line = [[[NSBox alloc] init] autorelease];
   [line setTitlePosition:NSNoTitle];
-  [line setFrameFromContentFrame:NSMakeRect(0,336,280,2)];
+  [line setFrame:NSMakeRect(0,336,280,2)];
   [_c_view addSubview:line];
 
   inspectorView = [[NSBox alloc] init];
   [inspectorView setTitlePosition:NSNoTitle];
-  [inspectorView setFrameFromContentFrame:NSMakeRect(2,2,276,330)];
+  [inspectorView setFrame:NSMakeRect(-2,-2,284,334)];
   [inspectorView setBorderType:NSNoBorder];
   [_c_view addSubview:inspectorView];
 	
@@ -312,6 +314,10 @@ NSString *ActiveProjectDidChangeNotification = @"ActiveProjectDidChange";
   }
   
   [self inspectorPopupDidChange:inspectorPopup];  
+
+  if (![inspector isVisible]) {
+    [inspector setFrameUsingName:@"Inspector"];
+  }
   [inspector makeKeyAndOrderFront:self];
 }
 
@@ -341,23 +347,23 @@ NSString *ActiveProjectDidChangeNotification = @"ActiveProjectDidChange";
 
 - (void)closeProject:(PCProject *)aProject
 {
-    PCProject	*currentProject;
-    NSString 	*key = [[aProject projectPath] stringByAppendingPathComponent:@"PC.project"];
-
-    currentProject = [[loadedProjects objectForKey:key] retain];
+  PCProject	*currentProject;
+  NSString 	*key = [[aProject projectPath] stringByAppendingPathComponent:@"PC.project"];
+  
+  currentProject = [[loadedProjects objectForKey:key] retain];
     
-    // Remove it from the loaded projects!
-    [loadedProjects removeObjectForKey:key];
-    [self setActiveProject:[[loadedProjects allValues] lastObject]];
+  // Remove it from the loaded projects!
+  [loadedProjects removeObjectForKey:key];
+  [self setActiveProject:[[loadedProjects allValues] lastObject]];
 
-    [currentProject autorelease];
-    
-    //~ Should I activate another project here?!
+  [currentProject autorelease];
+  
+  //~ Should I activate another project here?!
 }
 
 - (void)closeProject
 {
-    [[[self activeProject] projectWindow] performClose:self];
+  [[[self activeProject] projectWindow] performClose:self];
 }
 
 // ===========================================================================