Move resources and correct gorm loading logic

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

GNUmakefile

@@ -0,0 +1,71 @@
+#   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
+
+#
+# Each palette is a subproject
+#
+SUBPROJECTS = \
+	GormObjCHeaderParser \
+	GormLib \
+	GormCore \
+	GormPrefs \
+	Palettes \
+	Tools \
+	Applications
+
+-include GNUmakefile.preamble
+-include GNUmakefile.local
+
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+
+-include GNUmakefile.postamble
+
+include $(GNUSTEP_MAKEFILES)/Master/nsis.make

GormCore/GNUmakefile

@@ -38,8 +38,6 @@ srcdir = .
 
 SUBPROJECTS = Plugins
 
-include ../Version
-
 GormCore_HEADER_FILES = \
 	GormCore.h \
 	GormBoxEditor.h \
@@ -174,7 +172,33 @@ GormCore_RESOURCE_FILES = \
 	Plugins/Gorm/Gorm.plugin \
 	Plugins/Nib/Nib.plugin \
 	Plugins/Xib/Xib.plugin \
-	Plugins/GModel/GModel.plugin
+	Plugins/GModel/GModel.plugin \
+	Images/browserView.tiff \
+	Images/GormActionSelected.tiff \
+	Images/GormAction.tiff \
+	Images/GormOutletSelected.tiff \
+	Images/GormOutlet.tiff \
+	Images/outlineView.tiff
+
+GormCore_LANGUAGES = English
+
+GormCore_LOCALIZED_RESOURCE_FILES = \
+	GormClassEditor.gorm \
+	GormClassInspector.gorm \
+	GormClassPanel.gorm \
+	GormConnectionInspector.gorm \
+	GormCustomClassInspector.gorm \
+	GormDummyInspector.gorm \
+	GormFontView.gorm \
+	GormHelpInspector.gorm \
+	GormImageInspector.gorm \
+	GormInspectorPanel.gorm \
+	GormNSSplitViewInspector.gorm \
+	GormObjectInspector.gorm \
+	GormScrollViewAttributesInspector.gorm \
+	GormSetName.gorm \
+	GormSoundInspector.gorm \
+	GormViewSizeInspector.gorm
 
 -include GNUmakefile.preamble
 -include GNUmakefile.local

GormCore/GormClassEditor.m

@@ -66,7 +66,9 @@ NSImage *browserImage = nil;
   self = [super init];
   if (self != nil)
     {
-      if([NSBundle loadNibNamed: @"GormClassEditor" owner: self])
+      NSBundle *bundle = [NSBundle bundleForClass: [self class]];
+
+      if([bundle loadNibNamed: @"GormClassEditor" owner: self topLevelObjects: nil])
 	{
 	  NSNotificationCenter	*nc = [NSNotificationCenter defaultCenter];
 	  NSRect		 scrollRect = [classesView frame]; //  = {{0, 0}, {340, 188}};