Merge master into bindings branch

.cvsignore

@@ -1,6 +0,0 @@
-*.app
-*.debug
-*.profile
-*.palette
-*obj
-.gdbinit

.gitignore

@@ -3,5 +3,7 @@
 *.profile
 *.palette
 *.plugin
+.gdbinit
 obj
-InterfaceBuilder
+derived_src
+*.framework

Applications/GNUmakefile

@@ -0,0 +1,22 @@
+#
+# GNUmakefile - Generated by ProjectCenter
+#
+ifeq ($(GNUSTEP_MAKEFILES),)
+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
+endif
+ifeq ($(GNUSTEP_MAKEFILES),)
+ $(error You need to set GNUSTEP_MAKEFILES before compiling!)
+endif
+
+include $(GNUSTEP_MAKEFILES)/common.make
+
+# Generator bundles
+SUBPROJECTS = \
+	Gorm
+
+#
+# Makefiles
+#
+-include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+-include GNUmakefile.postamble

Applications/Gorm/English.lproj/Gorm.gorm/data.classes

@@ -4,11 +4,24 @@
 	Actions = (
 	    "alignSelectedObjects:",
 	    "arrangeSelectedObjects:",
+	    "endTesting:",
 	    "exportStrings:",
-	    "groupSelectionInView:",
+	    "groupSelectionInBox:",
 	    "groupSelectionInMatrix:",
+	    "groupSelectionInSplitView:",
+	    "groupSelectionInView:",
+	    "inspector:",
+	    "loadImage:",
+	    "loadSound:",
+	    "loadPalette:",
 	    "orderFrontFontPanel:",
-	    "translate:"
+	    "palettes:",
+	    "preferencesPanel:",
+	    "selectAllItems:",
+	    "setName:",
+	    "testinterface:",
+	    "translate:",
+	    "ungroup:"
 	);
 	Super = NSObject;
     };
@@ -55,6 +68,32 @@
 	);
 	Super = NSApplication;
     };
+    GormAppDelegate = {
+	Actions = (
+	    "copy:",
+	    "cut:",
+	    "delete:",
+	    "endTesting:",
+	    "groupSelectionInBox:",
+	    "groupSelectionInSplitView:",
+	    "inspector:",
+	    "loadImage:",
+	    "loadSound:",
+	    "ungroup:",
+	    "palettes:",
+	    "paste:",
+	    "preferencesPanel:",
+	    "selectAllItems:",
+	    "setName:",
+	    "testinterface:",
+	    "loadPalette:"
+	);
+	Outlets = (
+	    gormMenu,
+	    guideLineMenuItem
+	);
+	Super = NSObject;
+    };
     GormDocumentController = {
 	Actions = (
 	);

Applications/Gorm/GNUmakefile

@@ -0,0 +1,115 @@
+#   GNUmakefile: main makefile for GNUstep Object Relationship Modeller
+#
+#   Copyright (C) 1999,2002,2003 Free Software Foundation, Inc.
+#
+#   Author:  Gregory John Casamento <greg_casamento@yahoo.com>
+#   Date: 2003
+#   Author:  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+#   Date: 1999
+#   
+#   This file is part of GNUstep.
+#   
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#   
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#   
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+ifeq ($(GNUSTEP_MAKEFILES),)
+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
+  ifeq ($(GNUSTEP_MAKEFILES),)
+    $(warning )
+    $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!)
+    $(warning Perhaps gnustep-make is not properly installed,)
+    $(warning so gnustep-config is not in your PATH.)
+    $(warning )
+    $(warning Your PATH is currently $(PATH))
+    $(warning )
+  endif
+endif
+
+ifeq ($(GNUSTEP_MAKEFILES),)
+  $(error You need to set GNUSTEP_MAKEFILES before compiling!)
+endif
+
+PACKAGE_NAME = gorm
+export PACKAGE_NAME
+include $(GNUSTEP_MAKEFILES)/common.make
+
+CVS_MODULE_NAME = gorm
+SVN_MODULE_NAME = gorm
+SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/apps
+
+
+include ./Version
+
+#
+# Each palette is a subproject
+#
+SUBPROJECTS = \
+	Palettes
+
+#
+# MAIN APP
+#
+APP_NAME = Gorm
+Gorm_PRINCIPAL_CLASS=Gorm
+Gorm_APPLICATION_ICON=Gorm.tiff
+Gorm_RESOURCE_FILES = \
+	GormInfo.plist \
+	Resources/Defaults.plist \
+	Palettes/0Menus/0Menus.palette \
+	Palettes/1Windows/1Windows.palette \
+	Palettes/2Controls/2Controls.palette \
+	Palettes/3Containers/3Containers.palette \
+	Palettes/4Data/4Data.palette \
+	Images/FileIcon_gmodel.tiff \
+	Images/GormEHCoil.tiff \
+	Images/GormEHLine.tiff \
+	Images/GormEVCoil.tiff \
+	Images/GormEVLine.tiff \
+	Images/GormFile.tiff \
+	Images/GormMenu.tiff \
+	Images/GormMHCoil.tiff \
+	Images/GormMHLine.tiff \
+	Images/GormMVCoil.tiff \
+	Images/GormMVLine.tiff \
+	Images/GormNib.tiff \
+	Images/GormPalette.tiff \
+        Images/Gorm.tiff \
+        Images/GormSourceTag.tiff \
+        Images/GormTargetTag.tiff \
+        Images/GormLinkImage.tiff \
+        Images/GormTesting.tiff \
+
+
+Gorm_LOCALIZED_RESOURCE_FILES = \
+	Gorm.gorm \
+	Gorm.rtfd
+
+Gorm_LANGUAGES = \
+	English
+
+Gorm_HEADERS = \
+	GormAppDelegate.h
+
+Gorm_OBJC_FILES = \
+	GormAppDelegate.m \
+	main.m 
+
+-include GNUmakefile.preamble
+-include GNUmakefile.local
+
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+include $(GNUSTEP_MAKEFILES)/application.make
+
+-include GNUmakefile.postamble

Applications/Gorm/GNUmakefile.postamble

@@ -31,8 +31,6 @@ ifeq ($(LN_S_RECURSIVE),)
 endif
 
 before-all::
-	$(RM_LN_S) InterfaceBuilder; \
-	$(LN_S_RECURSIVE) GormLib InterfaceBuilder
 
 after-all::
 
@@ -41,4 +39,3 @@ after-clean::
 after-distclean::
 
 after-clean::
-	$(RM_LN_S) InterfaceBuilder

Applications/Gorm/GNUmakefile.preamble

@@ -25,19 +25,18 @@
 
 # ADDITIONAL_OBJCFLAGS += -Wall -Werror
 ADDITIONAL_GUI_LIBS += \
+	-lInterfaceBuilder \
 	-lGormCore \
-	-lGorm \
 	-lGormObjCHeaderParser \
-	-lGormPrefs 
 
 ADDITIONAL_INCLUDE_DIRS += \
-	-IInterfaceBuilder \
-	-IGormObjCHeaderParser \
-	-IGormPrefs \
-	-IGormCore
-
+	-I../../InterfaceBuilder \
+	-I../../GormObjCHeaderParser \
+	-I../../GormCore \
+	-I../.. \
+	-I.
+	
 ADDITIONAL_LIB_DIRS += \
-	-LGormLib/$(GNUSTEP_OBJ_DIR) \
-	-LGormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-	-LGormPrefs/$(GNUSTEP_OBJ_DIR) \
-	-LGormCore/$(GNUSTEP_OBJ_DIR)
+	-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
+	-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../GormCore/GormCore.framework \

Applications/Gorm/GormAppDelegate.h

@@ -0,0 +1,80 @@
+/* GormAppDelegate.m
+ *
+ * Copyright (C) 2023 Free Software Foundation, Inc.
+ *
+ * Author:	Gregory John Casamento <greg.casamento@gmail.com>
+ * Date:	2023
+ *
+ * This file is part of GNUstep.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111
+ * USA.
+ */
+
+#include <GormCore/GormCore.h>
+#include <GormCore/GormPrefs.h>
+
+#include <GNUstepBase/GSObjCRuntime.h>
+
+@class NSDictionary;
+@class NSImage;
+@class NSMenu;
+@class NSMutableArray;
+@class NSSet;
+
+@interface GormAppDelegate : GormAbstractDelegate
+
+// preferences
+- (IBAction) preferencesPanel: (id) sender;
+
+// Cut/Paste operations
+- (IBAction) copy: (id)sender;
+- (IBAction) cut: (id)sender;
+- (IBAction) paste: (id)sender;
+- (IBAction) delete: (id)sender;
+- (IBAction) selectAllItems: (id)sender;
+
+// palettes/inspectors.
+- (IBAction) inspector: (id) sender;
+- (IBAction) palettes: (id) sender;
+- (IBAction) loadPalette: (id) sender;
+
+// sound & images
+- (IBAction) loadSound: (id) sender;
+- (IBAction) loadImage: (id) sender;
+
+// grouping/layout
+- (IBAction) groupSelectionInSplitView: (id)sender;
+- (IBAction) groupSelectionInBox: (id)sender;
+- (IBAction) groupSelectionInScrollView: (id)sender;
+- (IBAction) ungroup: (id)sender;
+
+// Classes actions
+- (IBAction) createSubclass: (id)sender;
+- (IBAction) loadClass: (id)sender;
+- (IBAction) createClassFiles: (id)sender;
+- (IBAction) instantiateClass: (id)sender;
+- (IBAction) addAttributeToClass: (id)sender;
+- (IBAction) remove: (id)sender;
+
+// Palettes Actions...
+- (IBAction) inspector: (id) sender;
+- (IBAction) palettes: (id) sender;
+- (IBAction) loadPalette: (id) sender;
+
+// Print
+- (IBAction) print: (id)sender;
+
+@end

Applications/Gorm/GormAppDelegate.m

@@ -0,0 +1,580 @@
+/* GormAppDelegate.m
+ *
+ * Copyright (C) 2023 Free Software Foundation, Inc.
+ *
+ * Author:	Gregory John Casamento <greg.casamento@gmail.com>
+ * Date:	2023
+ *
+ * This file is part of GNUstep.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111
+ * USA.
+ */
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSSet.h>
+
+#import <AppKit/NSImage.h>
+#import <AppKit/NSMenu.h>
+
+#import "GormAppDelegate.h"
+
+@implementation GormAppDelegate
+
+// App delegate...
+- (BOOL)applicationShouldOpenUntitledFile: (NSApplication *)sender
+{
+  if (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", nil) ==
+      NSWindows95InterfaceStyle)
+    {
+      return YES;
+    }
+
+  return NO;
+}
+
+- (void) applicationOpenUntitledFile: (NSApplication *)sender
+{
+  GormDocumentController *dc = [GormDocumentController sharedDocumentController];
+  // open a new document and build an application type document by default...
+  [dc newDocument: sender];
+}
+
+
+- (void) applicationDidFinishLaunching: (NSNotification *)n
+{
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+  if ( [defaults boolForKey: @"ShowInspectors"] )
+    {
+      [[[self inspectorsManager] panel] makeKeyAndOrderFront: self];
+    }
+  if ( [defaults boolForKey: @"ShowPalettes"] )
+    {
+      [[[self palettesManager] panel] makeKeyAndOrderFront: self];
+    }
+}
+
+- (void) applicationWillTerminate: (NSNotification *)n
+{
+  [[NSUserDefaults standardUserDefaults]
+    setBool: [[[self inspectorsManager] panel] isVisible]
+    forKey: @"ShowInspectors"];
+  [[NSUserDefaults standardUserDefaults]
+    setBool: [[[self palettesManager] panel] isVisible]
+    forKey: @"ShowPalettes"];
+}
+
+- (BOOL) applicationShouldTerminateAfterLastWindowClosed: (NSApplication *)sender
+{
+  if (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", nil) ==
+      NSWindows95InterfaceStyle)
+    {
+      GormDocumentController *docController;
+      docController = [GormDocumentController sharedDocumentController];
+
+      if ([[docController documents] count] > 0)
+	{
+	  return NO;
+	}
+      else
+	{
+	  return YES;
+	}
+    }
+
+  return NO;
+}
+
+
+- (BOOL) validateMenuItem: (NSMenuItem*)item
+{
+  GormDocument	*active = (GormDocument*)[self activeDocument];
+  SEL		action = [item action];
+  GormClassManager *cm = nil;
+  NSArray	*s = nil;
+
+  // if we have an active document...
+  if(active != nil)
+    {
+      cm = [active classManager];
+      s = [selectionOwner selection];
+    }
+
+  if(sel_isEqual(action, @selector(loadPalette:)))
+    {
+      return YES;
+    }
+  else if (sel_isEqual(action, @selector(close:))
+      || sel_isEqual(action, @selector(miniaturize:)))
+    {
+      if (active == nil)
+	{
+	  return NO;
+	}
+    }
+  else if (sel_isEqual(action, @selector(testInterface:)))
+    {
+      if (active == nil)
+	{
+	  return NO;
+	}
+    }
+  else if (sel_isEqual(action, @selector(copy:)))
+    {
+      if ([s count] == 0)
+	{
+	  return NO;
+	}
+      else
+	{
+	  id	    o = [s objectAtIndex: 0];
+	  NSString *n = [active nameForObject: o];
+	  if ([n isEqual: @"NSOwner"] || [n isEqual: @"NSFirst"])
+	    {
+	      return NO;
+	    }
+	}
+
+      return [selectionOwner respondsToSelector: @selector(copySelection)];
+    }
+  else if (sel_isEqual(action, @selector(cut:)))
+    {
+      if ([s count] == 0)
+	{
+	  return NO;
+	}
+      else
+	{
+	  id	    o = [s objectAtIndex: 0];
+	  NSString *n = [active nameForObject: o];
+	  if ([n isEqual: @"NSOwner"] || [n isEqual: @"NSFirst"])
+	    {
+	      return NO;
+	    }
+	}
+
+      return ([selectionOwner respondsToSelector: @selector(copySelection)]
+	&& [selectionOwner respondsToSelector: @selector(deleteSelection)]);
+    }
+  else if (sel_isEqual(action, @selector(delete:)))
+    {
+      if ([s count] == 0)
+	{
+	  return NO;
+	}
+      else
+	{
+	  id	    o = [s objectAtIndex: 0];
+	  NSString *n = [active nameForObject: o];
+	  if ([n isEqual: @"NSOwner"] || [n isEqual: @"NSFirst"])
+	    {
+	      return NO;
+	    }
+	}
+
+      return [selectionOwner respondsToSelector: @selector(deleteSelection)];
+    }
+  else if (sel_isEqual(action, @selector(paste:)))
+    {
+      if ([s count] == 0)
+	{
+	  return NO;
+	}
+      else
+	{
+	  id	o = [s objectAtIndex: 0];
+	  NSString *n = [active nameForObject: o];
+
+	  if ([n isEqual: @"NSOwner"] || [n isEqual: @"NSFirst"])
+	    {
+	      return NO;
+	    }
+	}
+
+      return [selectionOwner respondsToSelector: @selector(pasteInSelection)];
+    }
+  else if (sel_isEqual(action, @selector(setName:)))
+    {
+      NSString	*n;
+      id	o;
+
+      if ([s count] == 0)
+	{
+	  return NO;
+	}
+      if ([s count] > 1)
+	{
+	  return NO;
+	}
+      o = [s objectAtIndex: 0];
+      n = [active nameForObject: o];
+
+      if ([n isEqual: @"NSOwner"] || [n isEqual: @"NSFirst"]
+	|| [n isEqual: @"NSFont"] || [n isEqual: @"NSMenu"])
+	{
+	  return NO;
+	}
+      else if(![active isTopLevelObject: o])
+	{
+	  return NO;
+	}
+    }
+  else if(sel_isEqual(action, @selector(createSubclass:)) ||
+	  sel_isEqual(action, @selector(loadClass:)) ||
+	  sel_isEqual(action, @selector(createClassFiles:)) ||
+	  sel_isEqual(action, @selector(instantiateClass:)) ||
+	  sel_isEqual(action, @selector(addAttributeToClass:)) ||
+	  sel_isEqual(action, @selector(remove:)))
+    {
+      if(active == nil)
+	{
+	  return NO;
+	}
+
+      if(![active isEditingClasses])
+	{
+	  return NO;
+	}
+
+      if(sel_isEqual(action, @selector(createSubclass:)))
+	{
+	  NSArray *s = [selectionOwner selection];
+	  id o = nil;
+	  NSString *name = nil;
+
+	  if([s count] == 0 || [s count] > 1)
+	    return NO;
+
+	  o = [s objectAtIndex: 0];
+	  name = [o className];
+
+	  if([active classIsSelected] == NO)
+	    {
+	      return NO;
+	    }
+
+	  if([name isEqual: @"FirstResponder"])
+	    return NO;
+	}
+
+      if(sel_isEqual(action, @selector(createClassFiles:)) ||
+	 sel_isEqual(action, @selector(remove:)))
+	{
+	  id o = nil;
+	  NSString *name = nil;
+
+	  if ([s count] == 0)
+	    {
+	      return NO;
+	    }
+	  if ([s count] > 1)
+	    {
+	      return NO;
+	    }
+
+	  o = [s objectAtIndex: 0];
+	  name = [o className];
+	  if(![cm isCustomClass: name])
+	    {
+	      return NO;
+	    }
+	}
+
+      if(sel_isEqual(action, @selector(instantiateClass:)))
+	{
+	  id o = nil;
+	  NSString *name = nil;
+
+	  if ([s count] == 0)
+	    {
+	      return NO;
+	    }
+	  if ([s count] > 1)
+	    {
+	      return NO;
+	    }
+
+	  if([active classIsSelected] == NO)
+	    {
+	      return NO;
+	    }
+
+	  o = [s objectAtIndex: 0];
+	  name = [o className];
+	  if(name != nil)
+	    {
+	      id cm = [self classManager];
+	      return [cm canInstantiateClassNamed: name];
+	    }
+	}
+    }
+  else if(sel_isEqual(action, @selector(loadSound:)) ||
+	  sel_isEqual(action, @selector(loadImage:)) ||
+	  sel_isEqual(action, @selector(debug:)))
+    {
+      if(active == nil)
+	{
+	  return NO;
+	}
+    }
+
+  return YES;
+}
+
+
+- (IBAction) stop: (id)sender
+{
+  if(isTesting == NO)
+    {
+      // [super stop: sender];
+    }
+  else
+    {
+      [self endTesting: sender];
+    }
+}
+
+- (IBAction) miniaturize: (id)sender
+{
+  NSWindow	*window = [(GormDocument *)[self activeDocument] window];
+
+  [window miniaturize: self];
+}
+
+/** Info Menu Actions */
+- (IBAction) preferencesPanel: (id) sender
+{
+  if(! preferencesController)
+    {
+      preferencesController =  [[GormPrefController alloc] init];
+    }
+
+  [[preferencesController panel] makeKeyAndOrderFront:nil];
+}
+
+/** Document Menu Actions */
+- (IBAction) close: (id)sender
+{
+  GormDocument  *document = (GormDocument *)[self activeDocument];
+  if([document canCloseDocument])
+    {
+      [document close];
+    }
+}
+
+- (IBAction) debug: (id) sender
+{
+  [[self activeDocument] performSelector: @selector(printAllEditors)];
+}
+
+- (IBAction) loadSound: (id) sender
+{
+  [(GormDocument *)[self activeDocument] openSound: sender];
+}
+
+- (IBAction) loadImage: (id) sender
+{
+  [(GormDocument *)[self activeDocument] openImage: sender];
+}
+
+
+/** Edit Menu Actions */
+
+- (IBAction) copy: (id)sender
+{
+  if ([[selectionOwner selection] count] == 0
+      || [selectionOwner respondsToSelector: @selector(copySelection)] == NO)
+    return;
+
+  if([self isConnecting])
+    {
+      [self stopConnecting];
+    }
+
+  [(id<IBSelectionOwners,IBEditors>)selectionOwner copySelection];
+}
+
+
+- (IBAction) cut: (id)sender
+{
+  if ([[selectionOwner selection] count] == 0
+      || [selectionOwner respondsToSelector: @selector(copySelection)] == NO
+      || [selectionOwner respondsToSelector: @selector(deleteSelection)] == NO)
+    return;
+
+  if([self isConnecting])
+    {
+      [self stopConnecting];
+    }
+
+  [(id<IBSelectionOwners,IBEditors>)selectionOwner copySelection];
+  [(id<IBSelectionOwners,IBEditors>)selectionOwner deleteSelection];
+}
+
+- (IBAction) paste: (id)sender
+{
+  if ([selectionOwner respondsToSelector: @selector(pasteInSelection)] == NO)
+    return;
+
+  if([self isConnecting])
+    {
+      [self stopConnecting];
+    }
+
+  [(id<IBSelectionOwners,IBEditors>)selectionOwner pasteInSelection];
+}
+
+
+- (IBAction) delete: (id)sender
+{
+  if ([[selectionOwner selection] count] == 0
+    || [selectionOwner respondsToSelector: @selector(deleteSelection)] == NO)
+    return;
+
+  if([self isConnecting])
+    {
+      [self stopConnecting];
+    }
+
+  [(id<IBSelectionOwners,IBEditors>)selectionOwner deleteSelection];
+}
+
+- (IBAction) selectAll: (id)sender
+{
+  if ([[selectionOwner selection] count] == 0
+    || [selectionOwner respondsToSelector: @selector(deleteSelection)] == NO)
+    return;
+
+  if([self isConnecting])
+    {
+      [self stopConnecting];
+    }
+
+  [(id<IBSelectionOwners,IBEditors>)selectionOwner deleteSelection];
+}
+
+- (IBAction) selectAllItems: (id)sender
+{
+  return;
+}
+
+/** Grouping */
+
+- (IBAction) groupSelectionInSplitView: (id)sender
+{
+  if ([[selectionOwner selection] count] < 2
+      || [selectionOwner respondsToSelector: @selector(groupSelectionInSplitView)] == NO)
+    return;
+
+  [(GormGenericEditor *)selectionOwner groupSelectionInSplitView];
+}
+
+- (IBAction) groupSelectionInBox: (id)sender
+{
+  if ([selectionOwner respondsToSelector: @selector(groupSelectionInBox)] == NO)
+    return;
+  [(GormGenericEditor *)selectionOwner groupSelectionInBox];
+}
+
+- (IBAction) groupSelectionInView: (id)sender
+{
+  if ([selectionOwner respondsToSelector: @selector(groupSelectionInView)] == NO)
+    return;
+  [(GormGenericEditor *)selectionOwner groupSelectionInView];
+}
+
+- (IBAction) groupSelectionInScrollView: (id)sender
+{
+  if ([selectionOwner respondsToSelector: @selector(groupSelectionInScrollView)] == NO)
+    return;
+  [(GormGenericEditor *)selectionOwner groupSelectionInScrollView];
+}
+
+- (IBAction) groupSelectionInMatrix: (id)sender
+{
+  if ([selectionOwner respondsToSelector: @selector(groupSelectionInMatrix)] == NO)
+    return;
+  [(GormGenericEditor *)selectionOwner groupSelectionInMatrix];
+}
+
+- (IBAction) ungroup: (id)sender
+{
+  // NSLog(@"ungroup: selectionOwner %@", selectionOwner);
+  if ([selectionOwner respondsToSelector: @selector(ungroup)] == NO)
+    return;
+  [(GormGenericEditor *)selectionOwner ungroup];
+}
+
+/** Classes actions */
+
+- (IBAction) createSubclass: (id)sender
+{
+  [(GormDocument *)[self activeDocument] createSubclass: sender];
+}
+
+- (IBAction) loadClass: (id)sender
+{
+  // Call the current document and create the class
+  // descibed by the header
+  [(GormDocument *)[self activeDocument] loadClass: sender];
+}
+
+- (IBAction) createClassFiles: (id)sender
+{
+  [(GormDocument *)[self activeDocument] createClassFiles: sender];
+}
+
+- (IBAction) instantiateClass: (id)sender
+{
+   [(GormDocument *)[self activeDocument] instantiateClass: sender];
+}
+
+- (IBAction) addAttributeToClass: (id)sender
+{
+  [(GormDocument *)[self activeDocument] addAttributeToClass: sender];
+}
+
+- (IBAction) remove: (id)sender
+{
+  [(GormDocument *)[self activeDocument] remove: sender];
+}
+
+/** Palettes Actions... */
+
+- (IBAction) inspector: (id) sender
+{
+  [[[self inspectorsManager] panel] makeKeyAndOrderFront: self];
+}
+
+- (IBAction) palettes: (id) sender
+{
+  [[[self palettesManager] panel] makeKeyAndOrderFront: self];
+}
+
+- (IBAction) loadPalette: (id) sender
+{
+  [[self palettesManager] openPalette: sender];
+}
+
+// Print
+
+- (IBAction) print: (id) sender
+{
+  [[NSApp keyWindow] print: sender];
+}
+
+@end

Applications/Gorm/GormInfo.plist

@@ -1,7 +1,9 @@
 {
     NSIcon = "Gorm.tiff";
     NSMainNibFile = "Gorm.gorm";
+    NSPrincipalClass = "NSApplication";
     NSRole = "Editor";
+    
     NSTypes = (
       {
 	NSName = "GSGormFileType";
@@ -48,18 +50,19 @@
         NSIcon = "GormPalette.tiff";
       }
     );
+
     ApplicationDescription = "[GNUstep | Graphical] Object Relationship Modeller";
     ApplicationIcon = "Gorm.tiff";
     ApplicationName = "Gorm";
-    ApplicationRelease = "Gorm 1.3.1 (Release)";
+    ApplicationRelease = "Gorm 1.4.0 (Unreleased)";
     Authors = ("Gregory John Casamento <greg.casamento@gmail.com>",
     	       "Adam Fedor <fedor@gnu.org>",
     	       "Richard Frith-Macdonald <rfm@gnu.org>",
 	       "Wolfgang Lux <wolfgang.lux@gmail.com>",
                "Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>",
                "Sergii Stoian <stoyan255@gmail.com>");
-    Copyright = "Copyright (C) 1999-2022 FSF";
+    Copyright = "Copyright (C) 1999-2023 FSF";
     CopyrightDescription = "Released under the GNU General Public License 3.0";
-    NSBuildVersion = "1.3.1 Jan 15 2022";
+    NSBuildVersion = "1.4.0";
     GSDesktopInstallationDomain=SYSTEM;
 }

Applications/Gorm/Palettes/0Menus/GNUmakefile.preamble

@@ -0,0 +1,19 @@
+# Additional include directories the compiler should search
+ADDITIONAL_INCLUDE_DIRS += -I../../../..
+
+ifeq ($(GNUSTEP_TARGET_OS),mingw32)
+ADDITIONAL_LIB_DIRS += \
+        -L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/GormCore.framework
+
+ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
+endif
+ifeq ($(GNUSTEP_TARGET_OS),cygwin)
+ADDITIONAL_LIB_DIRS += \
+        -L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/GormCore.framework
+
+$(PALETTE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore
+endif

Applications/Gorm/Palettes/0Menus/GormMenuAttributesInspector.m

@@ -79,7 +79,7 @@
     }
   else if ( sender == menuType ) 
     {
-      GormDocument *doc = (GormDocument *)[(id<IB>)NSApp activeDocument];
+      GormDocument *doc = (GormDocument *)[(id<IB>)[NSApp delegate] activeDocument];
       int tag = [[menuType selectedCell] tag];
       
       switch ( tag ) 
@@ -129,7 +129,7 @@
   if ( object == nil ) 
     return;
 
-  doc = (GormDocument *)[(id<IB>)NSApp activeDocument];
+  doc = (GormDocument *)[(id<IB>)[NSApp delegate] activeDocument];
 
   [titleText setStringValue: [object title]];
   [autoenable setState: ([object realAutoenablesItems]?NSOnState:NSOffState)];
@@ -157,7 +157,7 @@
 /* delegate method used for menu title */
 - (void)controlTextDidChange:(NSNotification *)aNotification
 {
-  GormDocument *doc = (GormDocument *)[(id<IB>)NSApp activeDocument];
+  GormDocument *doc = (GormDocument *)[(id<IB>)[NSApp delegate] activeDocument];
   [object setTitle: [titleText stringValue]];
   [doc touch];
 }

Applications/Gorm/Palettes/0Menus/GormMenuEditor.m

@@ -202,11 +202,11 @@
 		[NSArray arrayWithObject: GormLinkPboardType]
 			 owner: self];
 	      [pb setString: name forType: GormLinkPboardType];
-	      [NSApp displayConnectionBetween: item and: nil];
-	      [NSApp startConnecting];
+	      [[NSApp delegate] displayConnectionBetween: item and: nil];
+	      [[NSApp delegate] startConnecting];
 
 	      isLinkSource = YES;
-	      [self dragImage: [NSApp linkImage]
+	      [self dragImage: [[NSApp delegate] linkImage]
 			   at: dragPoint
 		       offset: NSZeroSize
 			event: theEvent
@@ -415,7 +415,7 @@
   isClosed = YES;
   [[NSNotificationCenter defaultCenter] removeObserver: self];
 
-  if ([(id<IB>)NSApp selectionOwner] == self)
+  if ([(id<IB>)[NSApp delegate] selectionOwner] == self)
     {
       [document resignSelectionForEditor: self];
     }
@@ -570,11 +570,11 @@
 	{
 	  item = [edited itemAtIndex: pos];
 	}
-      if (item == [NSApp connectSource])
+      if (item == [[NSApp delegate] connectSource])
 	{
 	  item = nil;
 	}
-      [NSApp displayConnectionBetween: [NSApp connectSource] and: item];
+      [[NSApp delegate] displayConnectionBetween: [[NSApp delegate] connectSource] and: item];
       return NSDragOperationLink;
     }
   else
@@ -587,7 +587,7 @@
 {
   if (dragType == GormLinkPboardType)
     {
-      [NSApp displayConnectionBetween: [NSApp connectSource] 
+      [[NSApp delegate] displayConnectionBetween: [[NSApp delegate] connectSource] 
 	     and: nil];
     }
 }
@@ -833,8 +833,8 @@ void _attachAll(NSMenu *menu, id document)
 	{
 	  id	item = [edited itemAtIndex: pos];
 
-	  [NSApp displayConnectionBetween: [NSApp connectSource] and: item];
-	  [NSApp startConnecting];
+	  [[NSApp delegate] displayConnectionBetween: [[NSApp delegate] connectSource] and: item];
+	  [[NSApp delegate] startConnecting];
 	}
     }
   else

Applications/Gorm/Palettes/0Menus/GormMenuInspectors.m

@@ -62,7 +62,7 @@
 
 - (void) setObject: (id)anObject
 {
-  GormDocument *doc = (GormDocument *)[(id<IB>)NSApp activeDocument];
+  GormDocument *doc = (GormDocument *)[(id<IB>)[NSApp delegate] activeDocument];
 
   ASSIGN(object, nil); // remove reference to old object...
   [super setObject: anObject];
@@ -87,7 +87,7 @@
 - (void) updateMenuType: (id)sender
 {
   BOOL flag;
-  GormDocument *doc = (GormDocument *)[(id<IB>)NSApp activeDocument];
+  GormDocument *doc = (GormDocument *)[(id<IB>)[NSApp delegate] activeDocument];
 
   // look at the values passed back in the matrix.
   flag = ([[menuType cellAtRow: 0 column: 0] state] == NSOnState) ? YES : NO; // windows menu...
@@ -155,7 +155,7 @@
 - (void)controlTextDidChange:(NSNotification *)aNotification
 {
   id	o = [aNotification object];
-  id<IBDocuments> doc = [(id<IB>)NSApp activeDocument];
+  id<IBDocuments> doc = [(id<IB>)[NSApp delegate] activeDocument];
 
   if (o == titleText)
     {

Applications/Gorm/Palettes/1Windows/GNUmakefile.preamble

@@ -0,0 +1,19 @@
+# Additional include directories the compiler should search
+ADDITIONAL_INCLUDE_DIRS += -I../../../..
+
+ifeq ($(GNUSTEP_TARGET_OS),mingw32)
+ADDITIONAL_LIB_DIRS += \
+        -L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/GormCore.framework
+
+ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
+endif
+ifeq ($(GNUSTEP_TARGET_OS),cygwin)
+ADDITIONAL_LIB_DIRS += \
+        -L../../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/GormCore.framework
+
+$(PALETTE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore
+endif