Merge branch 'object_outline'

ChangeLog

@@ -1,3 +1,20 @@
+2024-12-29 Gregory John Casamento <[email protected]>
+
+	* GormCore/English.lproj/GormObjectOutlineView.gorm/data.classes
+	* GormCore/GNUmakefile
+	* GormCore/GormDocument.h
+	* GormCore/GormDocument.m
+	* GormCore/GormGenericEditor.h
+	* GormCore/GormObjectEditor.h
+	* GormCore/GormObjectEditor.m
+	* GormCore/GormObjectMainView.h
+	* GormCore/GormObjectMainView.m
+	* GormCore/GormObjectOutlineView.h
+	* GormCore/GormObjectOutlineView.m
+	* GormCore/GormObjectViewController.h
+	* GormCore/GormObjectViewController.m: Add support for
+	outline view of objects.
+
 2024-12-25 Gregory John Casamento <[email protected]>
 
 	* GormObjCHeaderParser/OCClass.m: Improve parsing

GormCore/English.lproj/GormObjectOutlineView.gorm/data.classes

@@ -0,0 +1,22 @@
+{
+    "## Comment" = "Do NOT change this file, Gorm maintains it";
+    FirstResponder = {
+	Actions = (
+	    "iconView:",
+	    "outlineView:"
+	);
+	Super = NSObject;
+    };
+    GormObjectViewController = {
+	Actions = (
+	    "iconView:",
+	    "outlineView:"
+	);
+	Outlets = (
+	    displayView,
+	    iconButton,
+	    outlineButton
+	);
+	Super = NSViewController;
+    };
+}

GormCore/GNUmakefile

@@ -69,6 +69,9 @@ GormCore_HEADER_FILES = \
 	GormNSWindow.h \
 	GormObjectEditor.h \
 	GormObjectInspector.h \
+	GormObjectMainView.h \
+	GormObjectOutlineView.h \
+	GormObjectViewController.h \
 	GormOpenGLView.h \
 	GormOutlineView.h \
 	GormPalettesManager.h \
@@ -148,6 +151,9 @@ GormCore_OBJC_FILES = \
 	GormNSWindow.m \
 	GormObjectEditor.m \
 	GormObjectInspector.m \
+	GormObjectMainView.m \
+	GormObjectOutlineView.m \
+	GormObjectViewController.m \
 	GormOpenGLView.m \
 	GormOutlineView.m \
 	GormPalettesManager.m \
@@ -217,6 +223,7 @@ GormCore_RESOURCE_FILES = \
 	Images/GormWindow.tiff \
 	Images/browserView.tiff \
 	Images/outlineView.tiff \
+	Images/iconView.tiff \
 	Resources/VersionProfiles.plist \
 	Resources/ClassInformation.plist 
 
@@ -237,6 +244,7 @@ GormCore_LOCALIZED_RESOURCE_FILES = \
 	GormInspectorPanel.gorm \
 	GormNSSplitViewInspector.gorm \
 	GormObjectInspector.gorm \
+	GormObjectOutlineView.gorm \
 	GormPalettePanel.gorm \
 	GormPrefColors.gorm \
 	GormPreferences.gorm \

GormCore/GormDocument.h

@@ -34,7 +34,7 @@
 #include <GNUstepGUI/GSNibContainer.h>
 
 @class GormClassManager, GormClassEditor, GormObjectProxy, GormFilesOwner, 
-  GormFilePrefsManager, GormDocumentWindow;
+  GormFilePrefsManager, GormDocumentWindow, GormObjectViewController;
 
 /*
  * Trivial classes for connections from objects to their editors, and from
@@ -99,6 +99,9 @@
   NSMutableSet          *topLevelObjects;
   NSMutableSet          *visibleWindows;
   NSMutableSet          *deferredWindows;
+
+  // Controllers...
+  GormObjectViewController *objectViewController;
 }
 
 /* Handle notifications */

GormCore/GormDocument.m

@@ -56,6 +56,7 @@
 #import "GormDocumentWindow.h"
 #import "GormDocumentController.h"
 #import "GormXLIFFDocument.h"
+#import "GormObjectViewController.h"
 
 @interface NSObject (GormNSCoding)
 @end
@@ -326,7 +327,8 @@ - (void) awakeFromNib
   NSMenu                *mainMenu = nil;
   NSEnumerator          *en = nil; 
   id                    o = nil;
-
+  NSOutlineView         *outlineView = [[NSOutlineView alloc] init];
+
   // get the window and cache it...
   window = (GormDocumentWindow *)[self _docWindow];
   [IBResourceManager registerForAllPboardTypes:window
@@ -361,22 +363,72 @@ - (void) awakeFromNib
       object: window];
 
   // objects...
+  NSScrollView *outlineScrollView = [[NSScrollView alloc] initWithFrame: scrollRect];
+  NSTableColumn *tbo  = AUTORELEASE([[NSTableColumn alloc] initWithIdentifier: @"objects"]); 
+  NSTableColumn *tbc  = AUTORELEASE([[NSTableColumn alloc] initWithIdentifier: @"destination"]); 
+  NSTableColumn *tbs  = AUTORELEASE([[NSTableColumn alloc] initWithIdentifier: @"source"]); 
+  NSTableColumn *tbcl = AUTORELEASE([[NSTableColumn alloc] initWithIdentifier: @"class"]);
+  NSTableColumn *tbv  = AUTORELEASE([[NSTableColumn alloc] initWithIdentifier: @"version"]);
+
+  // Titles
+  [tbo setTitle: @"Objects"];
+  [tbc setTitle: @"Destination"];
+  [tbs setTitle: @"Source"];
+  [tbcl setTitle: @"Class"];
+  [tbv setTitle: @"Version"];
+
+  // Set up the outline view...
+  [outlineView setDrawsGrid: NO];
+  [outlineView setOutlineTableColumn: tbo];
+  [outlineView addTableColumn: tbo];
+  [outlineView addTableColumn: tbcl];
+  [outlineView addTableColumn: tbv];  
+  [outlineView addTableColumn: tbc];
+  [outlineView addTableColumn: tbs];
+  [outlineScrollView setHasVerticalScroller: YES];
+  [outlineScrollView setHasHorizontalScroller: YES];
+  [outlineScrollView setAutoresizingMask:
+		       NSViewHeightSizable|NSViewWidthSizable];
+  [outlineScrollView setBorderType: NSBezelBorder];
+
+  // Configure the scrollview...
   mainRect.origin = NSMakePoint(0,0);
   scrollView = [[NSScrollView alloc] initWithFrame: scrollRect];
   [scrollView setHasVerticalScroller: YES];
   [scrollView setHasHorizontalScroller: YES];
   [scrollView setAutoresizingMask:
 		NSViewHeightSizable|NSViewWidthSizable];
   [scrollView setBorderType: NSBezelBorder];
+
+  objectViewController = [[GormObjectViewController alloc] initWithNibName: @"GormObjectOutlineView"
+								    bundle: [NSBundle bundleForClass: [self class]]];
+  [objectViewController setDocument: self];
+  NSDebugLog(@"objectViewController = %@, view = %@", objectViewController, [objectViewController view]);
 
   objectsView = [[GormObjectEditor alloc] initWithObject: nil
 					  inDocument: self];
   [objectsView setFrame: mainRect];
   [objectsView setAutoresizingMask:
 		 NSViewHeightSizable|NSViewWidthSizable];
   [scrollView setDocumentView: objectsView];
-  RELEASE(objectsView); 
+  RELEASE(objectsView);
 
+  [objectViewController setIconView: scrollView];
+  RELEASE(scrollView);
+
+  [outlineScrollView setDocumentView: outlineView];
+  [objectViewController setOutlineView: outlineScrollView];
+  [outlineView setDataSource: self];
+  [self deactivateEditors];
+  [outlineView reloadData];
+  [self reactivateEditors];
+
+  RELEASE(outlineView);
+
+  [[objectViewController view] setAutoresizingMask:
+				 NSViewHeightSizable|NSViewWidthSizable];
+  [objectViewController resetDisplayView: scrollView];
+
   // images...
   mainRect.origin = NSMakePoint(0,0);
   imagesScrollView = [[NSScrollView alloc] initWithFrame: scrollRect];
@@ -417,7 +469,7 @@ - (void) awakeFromNib
   /*
    * Set the objects view as the initial view the user's see on startup.
    */
-  [selectionBox setContentView: scrollView];
+  [selectionBox setContentView: [objectViewController view]]; //scrollView];
 
   // add to the objects view...
   [objectsView addObject: filesOwner];
@@ -952,7 +1004,7 @@ - (void) changeToViewWithTag: (int)tag
     {
     case 0: // objects
       {
-	[selectionBox setContentView: scrollView];
+	[selectionBox setContentView: [objectViewController view]]; //scrollView];
 	[toolbar setSelectedItemIdentifier: @"ObjectsItem"];
 	if (![[NSApp delegate] isConnecting])
 	  [self setSelectionFromEditor: objectsView];
@@ -2608,6 +2660,9 @@ - (void) setSelectionFromEditor: (id<IBEditors>)anEditor
  */
 - (void) touch
 {
+  [self deactivateEditors];
+  [[[objectViewController outlineView] documentView] reloadData];
+  [self reactivateEditors];
   [self updateChangeCount: NSChangeDone];
 }
 
@@ -3780,24 +3835,6 @@ - (NSArray *) validate
 	}
     }
 
-  /*
-  NSLog(@"Checking connections..."); // %@", connections);
-  en = [connections objectEnumerator];
-  o = nil;
-  while ((o = [en nextObject]) != nil)
-    {
-      id src = [o source];
-      id dst = [o destination];
-      NSString *label = [o label];
-      
-      if ([o isKindOfClass: [NSNibControlConnector class]])
-	{
-	}
-      else if ([o isKindOfClass: [NSNibOutletConnector class]])
-	{
-	}
-    }
-  */
   return results;
 }
 
@@ -3917,26 +3954,145 @@ - (id) outlineView: (NSOutlineView *)ov
 	     child: (NSInteger)index
 	    ofItem: (id)item
 {
-  return nil;
+  id result = nil;
+
+  [self deactivateEditors];
+  NSDebugLog(@"index = %ld, item = %@", index, item);
+  if (item == nil)
+    {
+     result = [[topLevelObjects allObjects] objectAtIndex: index];
+    }
+  else if ([item isKindOfClass: [NSWindow class]])
+    {
+      result = [item contentView];
+    }
+  else if ([item isKindOfClass: [NSView class]])
+    {
+      result = [[item subviews] objectAtIndex: index];
+    }
+  else if ([item isKindOfClass: [NSMenu class]])
+    {
+      result = [item itemAtIndex: index];
+    }
+  else if ([item isKindOfClass: [NSMenuItem class]])
+    {
+      result = [item submenu];
+    }
+  NSDebugLog(@"result = %@", result);
+  [self reactivateEditors];
+
+  return result;
 }
 
 - (BOOL) outlineView: (NSOutlineView *)ov
     isItemExpandable: (id)item
 {
-  return NO;
+  BOOL f = NO;
+
+  [self deactivateEditors];
+  if (item == nil)
+    {
+      f = [topLevelObjects count] > 0;
+    }
+  else if ([item isKindOfClass: [NSWindow class]])
+    {
+      f = [item contentView] != nil;
+    }
+  else if ([item isKindOfClass: [NSView class]])
+    {
+      f = [[item subviews] count] > 0; 
+    }  
+  else if ([item isKindOfClass: [NSMenu class]])
+    {
+      f = [item numberOfItems] > 0; 
+    }
+  else if ([item isKindOfClass: [NSMenuItem class]])
+    {
+      f = [item hasSubmenu];
+    }
+  [self reactivateEditors];
+
+  NSDebugLog(@"f = %d",f);
+  return f;
 }
 
 - (NSInteger) outlineView: (NSOutlineView *)ov
    numberOfChildrenOfItem: (id)item
 {
-  return 0;
+  NSInteger c = 0;
+
+  [self deactivateEditors];
+  if (item == nil)
+    {
+      c = [topLevelObjects count];
+    }
+  else if ([item isKindOfClass: [NSWindow class]])
+    {
+      c = 1; // We are only counting the contentView...
+    }
+  else if ([item isKindOfClass: [NSView class]])
+    {
+      c = [[item subviews] count]; 
+    }
+  else if ([item isKindOfClass: [NSMenu class]])
+    {
+      c = [item numberOfItems]; 
+    }
+  else if ([item isKindOfClass: [NSMenuItem class]])
+    {
+      c = 1; // one submenu...
+    }
+  [self reactivateEditors];
+
+  NSDebugLog(@"c = %ld", c);
+  return c;
 }
 
 - (id) outlineView: (NSOutlineView *)ov
        objectValueForTableColumn: (NSTableColumn *)tableColumn
-       byItem: (id)tem
+       byItem: (id)item
 {
-  return nil;
+  id value = nil;
+  NSString *className = [classManager classNameForObject: item];
+  NSString *name = [self nameForObject: item];
+  NSUInteger version = 0;
+
+  [self deactivateEditors];
+  if ([[tableColumn identifier] isEqualToString: @"objects"])
+    {
+      NSString *title = @"";
+
+      if ([item respondsToSelector: @selector(title)])
+	{
+	  title = [item title];
+	  value = [NSString stringWithFormat: @"%@ : %@", title, (name != nil)?name:@"*Unnamed*"];
+	}
+      else
+	{
+	  value = [NSString stringWithFormat: @"%@", (name != nil)?name:@"*Unnamed*"];
+	}
+    }
+  else if ([[tableColumn identifier] isEqualToString: @"class"])
+    {
+      value = className;
+    }
+  else if ([[tableColumn identifier] isEqualToString: @"version"])
+    {
+      value = [NSNumber numberWithInteger: version];
+    }
+  else if ([[tableColumn identifier] isEqualToString: @"destination"])
+    {
+      NSArray *c = [self connectorsForDestination: item];
+      value = [NSNumber numberWithInteger: [c count]];
+    }
+  else if ([[tableColumn identifier] isEqualToString: @"source"])
+    {
+      NSArray *c = [self connectorsForSource: item];
+      value = [NSNumber numberWithInteger: [c count]];
+    }
+  [self reactivateEditors];
+
+  return value;
 }
 
 // Other methods...