Add image

gnustep · Dec 30, 2024 · c73df41 · c73df41
1 parent 6530a93
commit c73df41
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/GormCore/English.lproj/GormObjectOutlineView.gorm/editor.tiff b/GormCore/English.lproj/GormObjectOutlineView.gorm/editor.tiff
diff --git a/GormCore/English.lproj/GormObjectOutlineView.gorm/objects.gorm b/GormCore/English.lproj/GormObjectOutlineView.gorm/objects.gorm
diff --git a/GormCore/GormDocument.m b/GormCore/GormDocument.m
@@ -419,10 +419,8 @@ - (void) awakeFromNib
   [outlineScrollView setDocumentView: outlineView];
   [objectViewController setOutlineView: outlineScrollView];
   [outlineView setDataSource: self];
-  [self deactivateEditors];
-  [outlineView reloadData];
-  [self reactivateEditors];
-
+  [objectViewController reloadOutlineView];
+
   RELEASE(outlineView);
 
   [[objectViewController view] setAutoresizingMask:
@@ -2660,9 +2658,7 @@ - (void) setSelectionFromEditor: (id<IBEditors>)anEditor
  */
 - (void) touch
 {
-  [self deactivateEditors];
-  [[[objectViewController outlineView] documentView] reloadData];
-  [self reactivateEditors];
+  [objectViewController reloadOutlineView];
   [self updateChangeCount: NSChangeDone];
 }
 
@@ -3956,7 +3952,9 @@ - (id) outlineView: (NSOutlineView *)ov
 {
   id result = nil;
 
-  [self deactivateEditors];
+  if ([objectViewController editor] == NO)
+    [self deactivateEditors];
+
   NSDebugLog(@"index = %ld, item = %@", index, item);
   if (item == nil)
     {
@@ -3979,7 +3977,8 @@ - (id) outlineView: (NSOutlineView *)ov
       result = [item submenu];
     }
   NSDebugLog(@"result = %@", result);
-  [self reactivateEditors];
+  if ([objectViewController editor] == NO)
+    [self reactivateEditors];
 
   return result;
 }
@@ -3989,7 +3988,8 @@ - (BOOL) outlineView: (NSOutlineView *)ov
 {
   BOOL f = NO;
 
-  [self deactivateEditors];
+  if ([objectViewController editor] == NO)
+    [self deactivateEditors];
   if (item == nil)
     {
       f = [topLevelObjects count] > 0;
@@ -4010,7 +4010,8 @@ - (BOOL) outlineView: (NSOutlineView *)ov
     {
       f = [item hasSubmenu];
     }
-  [self reactivateEditors];
+  if ([objectViewController editor] == NO)
+    [self reactivateEditors];
 
   NSDebugLog(@"f = %d",f);
   return f;
@@ -4021,7 +4022,8 @@ - (NSInteger) outlineView: (NSOutlineView *)ov
 {
   NSInteger c = 0;
 
-  [self deactivateEditors];
+  if ([objectViewController editor] == NO)
+    [self deactivateEditors];
   if (item == nil)
     {
       c = [topLevelObjects count];
@@ -4042,7 +4044,8 @@ - (NSInteger) outlineView: (NSOutlineView *)ov
     {
       c = 1; // one submenu...
     }
-  [self reactivateEditors];
+  if ([objectViewController editor] == NO)
+    [self reactivateEditors];
 
   NSDebugLog(@"c = %ld", c);
   return c;
@@ -4057,7 +4060,8 @@ - (id) outlineView: (NSOutlineView *)ov
   NSString *name = [self nameForObject: item];
   NSUInteger version = 0;
 
-  [self deactivateEditors];
+  if ([objectViewController editor] == NO)
+    [self deactivateEditors];
   if ([[tableColumn identifier] isEqualToString: @"objects"])
     {
       NSString *title = @"";
@@ -4090,7 +4094,8 @@ - (id) outlineView: (NSOutlineView *)ov
       NSArray *c = [self connectorsForSource: item];
       value = [NSNumber numberWithInteger: [c count]];
     }
-  [self reactivateEditors];
+  if ([objectViewController editor] == NO)
+    [self reactivateEditors];
 
   return value;
 }

diff --git a/GormCore/GormObjectViewController.m b/GormCore/GormObjectViewController.m
@@ -86,6 +86,7 @@ - (IBAction) outlineView: (id)sender
 - (IBAction) editorButton: (id)sender
 {
   _editor = !_editor;
+  [[_outlineView documentView] reloadData];
 }
 
 - (void) resetDisplayView: (NSView *)view

diff --git a/GormCore/Images/editor.tiff b/GormCore/Images/editor.tiff