ProjectWindow, ProjectLauncher, ApplicationProject Inspector.gorm fixes

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

Documentation/ChangeLog

@@ -1,5 +1,37 @@
 2004-06-20 Serg Stoyan <stoyan255@ukr.net>
 
+	* Library/PCProjectWindow.m: 
+	(activeProjectDidChange:): Take into account subprojects of 
+	subprojects.
+	(showProjectLaunch:): Remove attention panel if project is not
+	executable.
+	
+	* Library/PCProjectBrowser.m: (activeProjectDidChange:): ditto.
+	Take into account subprojects of subprojects.
+	
+	* Library/PCProjectLauncher.m:
+	(debug:): Check if project is executable and order attention panel
+	if not.
+
+	* Modules/ApplicationProject/Resources/Inspector.gorm:
+	Fix connection between "Add" button and addDocIcon: method.
+	
+	* Modules/ApplicationProject/PCAppProject.m: 
+	(appendApplication:): Removed.
+	(appndHead:): Move appendApplication's code here. Write into 
+	GNUmakefile <projectName>_STANDARD_INSTALL = no if install dir 
+	attribute was not set.
+	* Modules/BundleProject/PCBundleProject.m: 
+	(appendHead:): Write into GNUmakefile 
+	<projectName>_STANDARD_INSTALL = no if install dir attribute was 
+	not set.
+	* Modules/RenaissanceProject/PCRenaissanceProject.m: 
+	(appendApplication:): ditto.
+	* Modules/ToolProject/PCToolProject.m:
+	(appendHead:): ditto
+	
+2004-06-19 Serg Stoyan <stoyan255@ukr.net>
+
 	* Library/PCProjectManager.m:
 	(convertLegacyProject:atPath:): Get files list from .pcproj file not
 	from directories.
@@ -39,7 +71,7 @@
 	(filesForAdd): Fix setting panel attributes.
 	
 	* Modules/AggregateProject/PCAggregateProject.m: 
-	(appendApplication:): (appendHead:) Added generating of VERSION var.
+	(appendHead:) Added generating of VERSION var.
 	* Modules/ApplicationProject/PCAppProject.m: 
 	(appendApplication:): ditto.
 	* Modules/BundleProject/PCBundleProject.m: 

Library/PCProjectLauncher.m

@@ -217,20 +217,29 @@ enum {
   NSDistantObject <Terminal> *terminal;
   NSFileManager              *fm = [NSFileManager defaultManager];
 
-  /* Get the Terminal application */
+  // Check if project type is executable
+  if (![project isExecutable])
+    {
+      NSRunAlertPanel(@"Debug",
+		      @"The project is not executable",
+		      @"Close", nil, nil, nil);
+      [debugButton setState:NSOffState];
+      return;
+    }
+
+  // Get the Terminal application
   terminal = (NSDistantObject<Terminal> *)[NSConnection 
     rootProxyForConnectionWithRegisteredName:@"Terminal" host:nil];
 
   if (terminal == nil)
     {
-      NSRunAlertPanel(@"Attention!",
+      NSRunAlertPanel(@"Debug",
 		      @"Run Terminal application first",
 		      @"Close",nil,nil);
       [debugButton setState:NSOffState];
       return;
     }
 
-  // Executable
   pn = [dp stringByAppendingPathExtension:@"debug"];
   fp = [project projectPath];
   fp = [fp stringByAppendingPathComponent:pn];
@@ -240,7 +249,7 @@ enum {
   
   if ([fm isExecutableFileAtPath:fp] == NO)
     {
-      NSRunAlertPanel(@"Attention!",
+      NSRunAlertPanel(@"Debug",
 		      @"Can't execute %@!",
 		      @"Abort",nil,nil,pn);
       [debugButton setState:NSOffState];
@@ -273,9 +282,7 @@ enum {
 
   [debugButton setState:NSOffState];
 
-/*  RELEASE(args);
+  AUTORELEASE(args);
-  [runButton setEnabled:NO];
-  _isDebugging = YES;*/
 }
 
 - (void)run:(id)sender
@@ -293,9 +300,10 @@ enum {
     }
   else 
     {
-      NSRunAlertPanel(@"Attention!",
+      NSRunAlertPanel(@"Run",
 		      @"The project is not executable",
 		      @"Close", nil, nil, nil);
+      [runButton setState:NSOffState];
       return;
     }
 

Library/PCProjectWindow.m

@@ -599,14 +599,6 @@
   NSView  *view = nil;
   NSPanel *launchPanel = nil;
 
-  if ([project isExecutable] == NO)
-    {
-      NSRunAlertPanel(@"Attention!",
-		      @"This project is not executable!",
-		      @"OK",nil,nil);
-      return;
-    }
-  
   view = [[project projectLauncher] componentView];
   launchPanel = [[project projectManager] launchPanel];
 
@@ -728,7 +720,8 @@
   PCProject    *changedProject = [notifObject objectForKey:@"Project"];
 
   if (changedProject != project 
-      && changedProject != [project activeSubproject])
+      && changedProject != [project activeSubproject]
+      && [changedProject superProject] != [project activeSubproject])
     {
       return;
     }
@@ -743,8 +736,11 @@
 
 - (void)projectDictDidSave:(NSNotification *)aNotif
 {
-  if ([aNotif object] != project
+  PCProject *savedProject = [aNotif object];
-      && ![[project loadedSubprojects] containsObject:[aNotif object]])
+  
+  if (savedProject != project 
+      && savedProject != [project activeSubproject]
+      && [savedProject superProject] != [project activeSubproject])
     {
       return;
     }
@@ -754,13 +750,16 @@
 
 - (void)activeProjectDidChange:(NSNotification *)aNotif 
 {
-  if ([aNotif object] != project
+/*  PCProject *activeProject = [aNotif object];
-      && ![[project loadedSubprojects] containsObject:[aNotif object]])
+  
+  if (activeProject != project 
+      && activeProject != [project activeSubproject]
+      && [activeProject superProject] != [project activeSubproject])
     {
       return;
     }
 
-  [self makeKeyWindow];
+  [self makeKeyWindow];*/
 }
 
 - (void)preferencesDidChange:(NSNotification *)aNotif

Modules/ApplicationProject/PCAppProject+Inspector.m

@@ -66,7 +66,7 @@ NSString *PCITextFieldGetFocus = @"PCITextFieldGetFocusNotification";
   //
   docExtColumn = [(NSTableColumn *)[NSTableColumn alloc] 
     initWithIdentifier: @"extension"];
-  [[docExtColumn headerCell] setStringValue:@"Extenstion"];
+  [[docExtColumn headerCell] setStringValue:@"Extension"];
   [docExtColumn setWidth:75];
   docIconColumn = [(NSTableColumn *)[NSTableColumn alloc] 
     initWithIdentifier: @"icon"];

Modules/ApplicationProject/PCAppProject.h

@@ -88,7 +88,6 @@
 - (NSArray *)convertExtensions;
 - (BOOL)writeMakefile;
 - (void)appendHead:(PCMakefileFactory *)mff;
-- (void)appendApplication:(PCMakefileFactory *)mff;
 - (void)appendTail:(PCMakefileFactory *)mff;
 
 @end

Modules/ApplicationProject/PCAppProject.m

@@ -412,12 +412,9 @@
   // Create the new file
   [mf createMakefileForProject:projectName];
 
-  // Head
+  // Head (Application)
   [self appendHead:mf];
 
-  // Application part
-  [self appendApplication:mf];
-
   // Subprojects
   if ([[projectDict objectForKey:PCSubprojects] count] > 0)
     {
@@ -472,13 +469,8 @@
 
 - (void)appendHead:(PCMakefileFactory *)mff
 {
-  [mff appendString:
+  NSString *installDir = [projectDict objectForKey:PCInstallDir];
-    [NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR = %@\n",
-     [projectDict objectForKey:PCInstallDir]]];
-}
 
-- (void)appendApplication:(PCMakefileFactory *)mff
-{
   [mff appendString:@"\n#\n# Application\n#\n"];
   [mff appendString:[NSString stringWithFormat:@"VERSION = %@\n",
     [projectDict objectForKey:PCRelease]]];
@@ -489,6 +481,19 @@
     
   [mff appendString:[NSString stringWithFormat:@"%@_APPLICATION_ICON = %@\n",
                      projectName, [projectDict objectForKey:PCAppIcon]]];
+
+  if ([installDir isEqualToString:@""])
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"%@_STANDARD_INSTALL = no\n",
+        projectName]];
+    }
+  else
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR = %@\n",
+        installDir]];
+    }
 }
 
 - (void)appendTail:(PCMakefileFactory *)mff

Modules/ApplicationProject/Resources/Inspector.gorm/data.classes

@@ -150,7 +150,7 @@
 	    "setAppClass:",
 	    "setFile:",
 	    "clearFile:",
-	    "setDocIcon:",
+	    "addDocIcon:",
 	    "removeDocIcon:",
 	    "setCurrentLanguage:"
 	);

Modules/BundleProject/PCBundleProject.m

@@ -212,6 +212,8 @@
 
 - (void)appendHead:(PCMakefileFactory *)mff
 {
+  NSString *installDir = [projectDict objectForKey:PCInstallDir];
+
   [mff appendString:@"\n#\n# Bundle\n#\n"];
   [mff appendString:[NSString stringWithFormat:@"VERSION = %@\n",
   [projectDict objectForKey:PCRelease]]];
@@ -219,12 +221,22 @@
     projectName]];
   [mff appendString:[NSString stringWithFormat:@"BUNDLE_NAME = %@\n",
     projectName]];
-  [mff appendString:[NSString stringWithFormat:@"BUNDLE_EXTENSION = %@\n",
-   [projectDict objectForKey:PCBundleExtension]]];
-  [mff appendString:[NSString stringWithFormat:@"BUNDLE_INSTALL_DIR = %@\n",
-    [projectDict objectForKey:PCInstallDir]]];
   [mff appendString:[NSString stringWithFormat:@"%@_PRINCIPAL_CLASS = %@\n",
     projectName, [projectDict objectForKey:PCPrincipalClass]]];
+  [mff appendString:[NSString stringWithFormat:@"BUNDLE_EXTENSION = %@\n",
+    [projectDict objectForKey:PCBundleExtension]]];
+
+  if ([installDir isEqualToString:@""])
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"%@_STANDARD_INSTALL = no\n",
+        projectName]];
+    }
+  else
+    {
+      [mff appendString:[NSString stringWithFormat:@"BUNDLE_INSTALL_DIR = %@\n",
+        installDir]];
+    }
 }
 
 - (void)appendLibraries:(PCMakefileFactory *)mff

Modules/RenaissanceProject/PCRenaissanceProject.h

@@ -88,7 +88,6 @@
 - (NSArray *)convertExtensions;
 - (BOOL)writeMakefile;
 - (void)appendHead:(PCMakefileFactory *)mff;
-- (void)appendApplication:(PCMakefileFactory *)mff;
 - (void)appendTail:(PCMakefileFactory *)mff;
 
 @end

Modules/RenaissanceProject/PCRenaissanceProject.m

@@ -425,12 +425,9 @@
   // Create the new file
   [mf createMakefileForProject:projectName];
 
-  // Head
+  // Head (Application)
   [self appendHead:mf];
 
-  // Application part
-  [self appendApplication:mf];
-
   // Subprojects
   if ([[projectDict objectForKey:PCSubprojects] count] > 0)
     {
@@ -479,13 +476,8 @@
 
 - (void)appendHead:(PCMakefileFactory *)mff
 {
-  [mff appendString:
+  NSString *installDir = [projectDict objectForKey:PCInstallDir];
-    [NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR = %@\n",
-     [projectDict objectForKey:PCInstallDir]]];
-}
 
-- (void)appendApplication:(PCMakefileFactory *)mff
-{
   [mff appendString:@"\n#\n# Application\n#\n"];
   [mff appendString:[NSString stringWithFormat:@"VERSION = %@\n",
     [projectDict objectForKey:PCRelease]]];
@@ -496,6 +488,19 @@
     
   [mff appendString:[NSString stringWithFormat:@"%@_APPLICATION_ICON = %@\n",
                      projectName, [projectDict objectForKey:PCAppIcon]]];
+
+  if ([installDir isEqualToString:@""])
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"%@_STANDARD_INSTALL = no\n",
+        projectName]];
+    }
+  else
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR = %@\n",
+        installDir]];
+    }
 }
 
 - (void)appendTail:(PCMakefileFactory *)mff

Modules/ToolProject/PCToolProject.m

@@ -280,6 +280,8 @@
 
 - (void)appendHead:(PCMakefileFactory *)mff
 {
+  NSString *installDir = [projectDict objectForKey:PCInstallDir];
+
   [mff appendString:@"\n#\n# Tool\n#\n"];
   [mff appendString:[NSString stringWithFormat:@"VERSION = %@\n",
     [projectDict objectForKey:PCRelease]]];
@@ -289,6 +291,19 @@
     projectName]];
   [mff appendString:[NSString stringWithFormat:@"%@_TOOL_ICON = %@\n",
     projectName, [projectDict objectForKey:PCToolIcon]]];
+
+  if ([installDir isEqualToString:@""])
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"%@_STANDARD_INSTALL = no\n",
+        projectName]];
+    }
+  else
+    {
+      [mff appendString:
+	[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR = %@\n",
+        installDir]];
+    }
 }
 
 - (void)appendLibraries:(PCMakefileFactory *)mff