Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40284)
+++ ChangeLog	(working copy)
@@ -1,3 +1,19 @@
+2017-01-08  Graham Lee  <leeg@member.fsf.org>
+
+	* Modules/Projects/Application/PCAppProject+Inspector.h
+	* Modules/Projects/Application/PCAppProject+Inspector.m
+	* Modules/Projects/Application/PCAppProject.h
+	* Modules/Projects/Application/PCAppProject.m
+	* Modules/Projects/Application/Resources/AppController.h
+	* Modules/Projects/Application/Resources/AppController.m
+	* Modules/Projects/Application/Resources/Inspector.gorm/objects.gorm
+	* Modules/Projects/Application/Resources/Main.gsmarkup
+	* Modules/Projects/Application/Resources/MainMenu-GNUstep.gsmarkup
+	* Modules/Projects/Application/Resources/Mainmenu-OSX.gsmarkup
+	* Modules/Projects/Application/Resources/main.m
+	Remove the Application Type configuration and the Renaissance files
+	from the Application project template.
+
 2016-12-16 Riccardo Mottola <rm@gnu.org>
 
 	* Modules/Debuggers/ProjectCenter/PipeDelegate.m
Index: Modules/Projects/Application/PCAppProject+Inspector.h
===================================================================
--- Modules/Projects/Application/PCAppProject+Inspector.h	(revision 40284)
+++ Modules/Projects/Application/PCAppProject+Inspector.h	(working copy)
@@ -38,7 +38,6 @@
 // ----------------------------------------------------------------------------
 // --- Actions
 // ----------------------------------------------------------------------------
-- (IBAction)setAppType:(id)sender;
 - (IBAction)setAppClass:(id)sender;
 - (IBAction)setBundleIdentifier:(id)sender;
 
Index: Modules/Projects/Application/PCAppProject+Inspector.m
===================================================================
--- Modules/Projects/Application/PCAppProject+Inspector.m	(revision 40284)
+++ Modules/Projects/Application/PCAppProject+Inspector.m	(working copy)
@@ -134,25 +134,7 @@
 // --- Actions
 // ----------------------------------------------------------------------------
 
-- (IBAction)setAppType:(id)sender
-{
-  NSString       *appType = [appTypeField stringValue];
-  NSMutableArray *libs = [[projectDict objectForKey:PCLibraries] mutableCopy];
 
-  if ([appType isEqualToString:@"Renaissance"])
-    {
-      [libs addObject:@"Renaissance"];
-    }
-  else
-    {
-      [libs removeObject:@"Renaissance"];
-    }
-
-  [self setProjectDictObject:libs forKey:PCLibraries notify:YES];
-  RELEASE(libs);
-  [self setProjectDictObject:appType forKey:PCAppType notify:YES];
-}
-
 - (IBAction)setAppClass:(id)sender
 {
   [self setProjectDictObject:[appClassField stringValue]
@@ -562,7 +544,6 @@
 //  NSLog (@"PCAppProject: updateInspectorValues");
 
   // Project Attributes view
-  [appTypeField selectItemWithTitle:[projectDict objectForKey:PCAppType]];
   [appClassField setStringValue:[projectDict objectForKey: PCPrincipalClass]];
   [bundleIdentifierField setStringValue:[projectDict objectForKey: PCBundleIdentifier]];
 
Index: Modules/Projects/Application/PCAppProject.h
===================================================================
--- Modules/Projects/Application/PCAppProject.h	(revision 40284)
+++ Modules/Projects/Application/PCAppProject.h	(working copy)
@@ -48,7 +48,6 @@
 @interface PCAppProject : PCProject <ProjectType>
 {
   IBOutlet NSBox          *projectAttributesView;
-  IBOutlet NSPopUpButton  *appTypeField;
   IBOutlet NSTextField    *appClassField;
 
   PCAppTextField          *activeTextField;
Index: Modules/Projects/Application/PCAppProject.m
===================================================================
--- Modules/Projects/Application/PCAppProject.m	(revision 40284)
+++ Modules/Projects/Application/PCAppProject.m	(working copy)
@@ -211,23 +211,9 @@
 
   [projectDict setObject:[mainNibFile lastPathComponent]
                   forKey:PCMainInterfaceFile];
+  [projectDict setObject:[NSArray arrayWithObject:[mainNibFile lastPathComponent]]
+		  forKey:PCInterfaces];
 
-  // Renaissance
-  _file = [projBundle pathForResource:@"Main" ofType:@"gsmarkup"];
-  _2file = [_resourcePath stringByAppendingPathComponent:@"Main.gsmarkup"];
-  [pcfm copyFile:_file toFile:_2file];
-  _file = [projBundle pathForResource:@"MainMenu-GNUstep" ofType:@"gsmarkup"];
-  _2file = [_resourcePath 
-    stringByAppendingPathComponent:@"MainMenu-GNUstep.gsmarkup"];
-  [pcfm copyFile:_file toFile:_2file];
-  _file = [projBundle pathForResource:@"MainMenu-OSX" ofType:@"gsmarkup"];
-  _2file = [_resourcePath 
-    stringByAppendingPathComponent:@"MainMenu-OSX.gsmarkup"];
-  [pcfm copyFile:_file toFile:_2file];
-
-  [projectDict setObject:[NSArray arrayWithObjects:[mainNibFile lastPathComponent], @"Main.gsmarkup", @"MainMenu-GNUstep.gsmarkup", @"MainMenu-OSX.gsmarkup", nil] 
-    forKey:PCInterfaces];
-
   // Info-gnustep.plist
   _file = [projBundle pathForResource:@"Info" ofType:@"gnustep"];
   infoDict = [[NSMutableDictionary alloc] initWithContentsOfFile:_file];
@@ -418,16 +404,8 @@
   [self writeInfoEntry:@"FullVersionID" forKey:PCRelease];
   [self writeInfoEntry:@"NSExecutable" forKey:PCProjectName];
   [self writeInfoEntry:@"NSIcon" forKey:PCAppIcon];
-  if ([[projectDict objectForKey:PCAppType] isEqualToString:@"GORM"])
-    {
-      [self writeInfoEntry:@"NSMainNibFile" forKey:PCMainInterfaceFile];
-      [infoDict removeObjectForKey:@"GSMainMarkupFile"];
-    }
-  else
-    {
-      [self writeInfoEntry:@"GSMainMarkupFile" forKey:PCMainInterfaceFile];
-      [infoDict removeObjectForKey:@"NSMainNibFile"];
-    }
+  [self writeInfoEntry:@"NSMainNibFile" forKey:PCMainInterfaceFile];
+  [infoDict removeObjectForKey:@"GSMainMarkupFile"];
   [self writeInfoEntry:@"NSPrincipalClass" forKey:PCPrincipalClass];
   [infoDict setObject:@"Application" forKey:@"NSRole"];
   [self writeInfoEntry:@"NSTypes" forKey:PCDocumentTypes];
Index: Modules/Projects/Application/Resources/AppController.h
===================================================================
--- Modules/Projects/Application/Resources/AppController.h	(revision 40284)
+++ Modules/Projects/Application/Resources/AppController.h	(working copy)
@@ -12,8 +12,6 @@
 #define _PCAPPPROJ_APPCONTROLLER_H
 
 #import <AppKit/AppKit.h>
-// Uncomment if your application is Renaissance-based
-//#import <Renaissance/Renaissance.h>
 
 @interface AppController : NSObject
 {
Index: Modules/Projects/Application/Resources/AppController.m
===================================================================
--- Modules/Projects/Application/Resources/AppController.m	(revision 40284)
+++ Modules/Projects/Application/Resources/AppController.m	(working copy)
@@ -47,8 +47,6 @@
 
 - (void) applicationDidFinishLaunching: (NSNotification *)aNotif
 {
-// Uncomment if your application is Renaissance-based
-//  [NSBundle loadGSMarkupNamed: @"Main" owner: self];
 }
 
 - (BOOL) applicationShouldTerminate: (id)sender
Index: Modules/Projects/Application/Resources/Inspector.gorm/objects.gorm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Modules/Projects/Application/Resources/Main.gsmarkup
===================================================================
--- Modules/Projects/Application/Resources/Main.gsmarkup	(revision 40284)
+++ Modules/Projects/Application/Resources/Main.gsmarkup	(nonexistent)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE gsmarkup>
-<gsmarkup>
-
-    <objects>
-	<window/>
-    </objects>
-</gsmarkup>
Index: Modules/Projects/Application/Resources/MainMenu-GNUstep.gsmarkup
===================================================================
--- Modules/Projects/Application/Resources/MainMenu-GNUstep.gsmarkup	(revision 40284)
+++ Modules/Projects/Application/Resources/MainMenu-GNUstep.gsmarkup	(nonexistent)
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE gsmarkup>
-
-<!-- Remove any menu items and submenus which you don't need.  Add any
-     menu items and submenus which you need.  -->
-
-<gsmarkup>
-  <objects>
-
-    <menu type="main">
-
-      <menu title="Info">
-	<menuItem title="Info Panel..." 
-		  action="orderFrontStandardInfoPanel:"/>
-	<menuItem title="Preferences..." action=""/>
-	<menuItem title="Help..." action="orderFrontHelpPanel:" key="?"/>
-      </menu>
-
-      <menu title="Windows">
-	<menuItem title="Arrange In Front" action="arrangeInFront:"/>
-	<menuItem title="Miniaturize Window" action="performMiniaturize:" 
-		  key="m"/>
-	<menuItem title="Close Window" action="performClose:" key="w"/>
-      </menu>
-
-      <menu title="Services" type="services"/>
-
-      <menuItem title="Hide" action="hide:" key="h"/>
-      <menuItem title="Quit" action="terminate:" key="q"/>
-    </menu>
-  </objects>
-</gsmarkup>
Index: Modules/Projects/Application/Resources/MainMenu-OSX.gsmarkup
===================================================================
--- Modules/Projects/Application/Resources/MainMenu-OSX.gsmarkup	(revision 40284)
+++ Modules/Projects/Application/Resources/MainMenu-OSX.gsmarkup	(nonexistent)
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE gsmarkup>
-
-<gsmarkup>
-  <objects>
-
-    <menu type="main">
-
-      <menu title="MyApplication" type="apple">
-        <menuItem title="About MyApplication" 
-		  action="orderFrontStandardAboutPanel:"/>
-        <menuSeparator/>
-        <menuItem title="Preferences..." action="runPreferencesPanel:"/>
-        <menu title="Services" type="services"/>
-        <menuSeparator/>
-        <menuItem title="Hide MyApplication" action="hide:" key="h"/>
-        <menuItem title="Hide Others" action="hideOtherApplications:"/>
-        <menuItem title="Show All" action="unhideAllApplications:"/>
-        <menuSeparator/>
-        <menuItem title="Quit MyApplication" action="terminate:" key="q"/>
-      </menu>
-      
-      <menu title="File">
-        <menuItem title="New" action="" key="n"/>
-	<menuItem title="Open..." action="" key="o"/>
-	<menu title="Open Recent" type="openRecent">
-	  <menuItem title="Clear menu" action=""/>
-	</menu>
-	<menuSeparator/>
-	<menuItem title="Close" action="performClose:" key="w"/>
-	<menuItem title="Save" action="" key="s"/>
-	<menuItem title="Save As..." action="" key="S"/>
-	<menuItem title="Revert" action=""/>
-	<menuSeparator/>
-	<menuItem title="Page Setup..." action="runPageLayout:" key="P"/>
-	<menuItem title="Print..." action="print:" key="p"/>
-      </menu>
-
-      <menu title="Edit">
-	<menuItem title="Undo" action="undo:" key="z"/>
-	<menuItem title="Redo" action="redo:" key="Z"/>
-	<menuSeparator/>
-	<menuItem title="Cut" action="cut:" key="x"/>
-	<menuItem title="Copy" action="copy:" key="c"/>
-	<menuItem title="Paste" action="paste:" key="v"/>
-	<menuItem title="Delete" action="delete:"/>
-        <menuItem title="Select All" action="selectAll:" key="a"/>
-      </menu>
-
-      <menu title="Window" type="windows">
-	<menuItem title="Close Window" action="performClose:" key="w"/>
-        <menuItem title="Minimize Window" action="performMiniaturize:"
-		  key="m"/>
-        <menuSeparator/>
-        <menuItem title="Bring All to Front" action="arrangeInFront:" key=""/>
-      </menu>
-      
-      <menu title="Help">
-	<menuItem title="MyApplication Help" action="showHelp:" key="?"/>
-      </menu>
-    </menu>
-  </objects>
-</gsmarkup>
Index: Modules/Projects/Application/Resources/main.m
===================================================================
--- Modules/Projects/Application/Resources/main.m	(revision 40284)
+++ Modules/Projects/Application/Resources/main.m	(working copy)
@@ -11,20 +11,6 @@
 int 
 main(int argc, const char *argv[])
 {
-// Uncomment if your application is Renaissance application
-/*  CREATE_AUTORELEASE_POOL (pool);
-  [NSApplication sharedApplication];
-  [NSApp setDelegate: [AppController new]];
-
-  #ifdef GNUSTEP
-    [NSBundle loadGSMarkupNamed: @"MainMenu-GNUstep"  owner: [NSApp delegate]];
-  #else
-    [NSBundle loadGSMarkupNamed: @"MainMenu-OSX"  owner: [NSApp delegate]];
-  #endif
-   
-  RELEASE (pool);
-*/
-
   return NSApplicationMain (argc, argv);
 }