mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-04-23 06:20:47 +00:00
More fixes to stabilize Gorm.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@19304 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
00dbdae2ef
commit
89398d7533
6 changed files with 32 additions and 22 deletions
|
@ -55,7 +55,6 @@
|
|||
NSString *newClassName;
|
||||
int i;
|
||||
|
||||
[self _touch];
|
||||
classInfo = [[NSMutableDictionary alloc] initWithCapacity: 3];
|
||||
outlets = [[NSMutableArray alloc] initWithCapacity: 0];
|
||||
actions = [[NSMutableArray alloc] initWithCapacity: 0];
|
||||
|
@ -75,6 +74,8 @@
|
|||
[classInformation setObject: classInfo forKey: newClassName];
|
||||
[customClasses addObject: newClassName];
|
||||
|
||||
[self _touch];
|
||||
|
||||
[[NSNotificationCenter defaultCenter]
|
||||
postNotificationName: GormDidAddClassNotification
|
||||
object: self];
|
||||
|
@ -197,7 +198,7 @@
|
|||
{
|
||||
return;
|
||||
}
|
||||
[self _touch];
|
||||
|
||||
if (extraActions == nil)
|
||||
{
|
||||
extraActions = [[NSMutableArray alloc] initWithCapacity: 1];
|
||||
|
@ -218,6 +219,8 @@
|
|||
{
|
||||
[self addAction: anAction forClassNamed: subclassName];
|
||||
}
|
||||
|
||||
[self _touch];
|
||||
}
|
||||
|
||||
- (void) addOutlet: (NSString*)outlet forObject: (id)anObject
|
||||
|
@ -239,7 +242,6 @@
|
|||
return;
|
||||
}
|
||||
|
||||
[self _touch];
|
||||
if (extraOutlets == nil)
|
||||
{
|
||||
extraOutlets = [[NSMutableArray alloc] initWithCapacity: 1];
|
||||
|
@ -253,6 +255,8 @@
|
|||
{
|
||||
[self addOutlet: outlet forClassNamed: subclassName];
|
||||
}
|
||||
|
||||
[self _touch];
|
||||
}
|
||||
|
||||
- (void) replaceAction: (NSString *)oldAction
|
||||
|
@ -278,7 +282,6 @@
|
|||
int all_index = [allActions indexOfObject: oldAction];
|
||||
int extra_index = [extraActions indexOfObject: oldAction];
|
||||
|
||||
[self _touch];
|
||||
[extraActions replaceObjectAtIndex: extra_index withObject: newAction];
|
||||
[allActions replaceObjectAtIndex: all_index withObject: newAction];
|
||||
}
|
||||
|
@ -287,11 +290,12 @@
|
|||
int all_index = [allActions indexOfObject: oldAction];
|
||||
int actions_index = [actions indexOfObject: oldAction];
|
||||
|
||||
[self _touch];
|
||||
[actions replaceObjectAtIndex: actions_index withObject: newAction];
|
||||
[allActions replaceObjectAtIndex: all_index withObject: newAction];
|
||||
}
|
||||
|
||||
[self _touch];
|
||||
|
||||
// add the action to all of the subclasses, in the "AllActions" section...
|
||||
while((subclassName = [en nextObject]) != nil)
|
||||
{
|
||||
|
@ -330,7 +334,6 @@
|
|||
int all_index = [allOutlets indexOfObject: oldOutlet];
|
||||
int extra_index = [extraOutlets indexOfObject: oldOutlet];
|
||||
|
||||
[self _touch];
|
||||
[extraOutlets replaceObjectAtIndex: extra_index withObject: newOutlet];
|
||||
[allOutlets replaceObjectAtIndex: all_index withObject: newOutlet];
|
||||
}
|
||||
|
@ -339,11 +342,12 @@
|
|||
int all_index = [allOutlets indexOfObject: oldOutlet];
|
||||
int outlets_index = [outlets indexOfObject: oldOutlet];
|
||||
|
||||
[self _touch];
|
||||
[outlets replaceObjectAtIndex: outlets_index withObject: newOutlet];
|
||||
[allOutlets replaceObjectAtIndex: all_index withObject: newOutlet];
|
||||
}
|
||||
|
||||
[self _touch];
|
||||
|
||||
// add the action to all of the subclasses, in the "AllActions" section...
|
||||
while((subclassName = [en nextObject]) != nil)
|
||||
{
|
||||
|
@ -370,7 +374,6 @@
|
|||
{
|
||||
NSString *superName = [info objectForKey: @"Super"];
|
||||
|
||||
[self _touch];
|
||||
if (superName != nil)
|
||||
{
|
||||
NSArray *superActions;
|
||||
|
@ -390,6 +393,7 @@
|
|||
}
|
||||
}
|
||||
[extraActions removeObject: anAction];
|
||||
[self _touch];
|
||||
}
|
||||
|
||||
if(![className isEqualToString: @"FirstResponder"])
|
||||
|
@ -424,7 +428,6 @@
|
|||
{
|
||||
NSString *superName = [info objectForKey: @"Super"];
|
||||
|
||||
[self _touch];
|
||||
if (superName != nil)
|
||||
{
|
||||
NSArray *superOutlets;
|
||||
|
@ -440,6 +443,7 @@
|
|||
}
|
||||
}
|
||||
[extraOutlets removeObject: anOutlet];
|
||||
[self _touch];
|
||||
}
|
||||
|
||||
while((subclassName = [en nextObject]) != nil)
|
||||
|
@ -923,7 +927,6 @@
|
|||
NSEnumerator *en = [customClassMap keyEnumerator];
|
||||
id object = nil;
|
||||
|
||||
[self _touch];
|
||||
[customClasses removeObject: className];
|
||||
|
||||
while((object = [en nextObject]) != nil)
|
||||
|
@ -941,6 +944,7 @@
|
|||
}
|
||||
|
||||
[classInformation removeObjectForKey: className];
|
||||
[self _touch];
|
||||
|
||||
[[NSNotificationCenter defaultCenter]
|
||||
postNotificationName: GormDidDeleteClassNotification
|
||||
|
@ -960,7 +964,6 @@
|
|||
int index = 0;
|
||||
NSArray *subclasses = [self subClassesOf: oldName];
|
||||
|
||||
[self _touch];
|
||||
|
||||
[classInformation removeObjectForKey: oldName];
|
||||
[classInformation setObject: classInfo forKey: name];
|
||||
|
@ -999,6 +1002,8 @@
|
|||
[self setSuperClassNamed: name
|
||||
forClassNamed: sc];
|
||||
}
|
||||
|
||||
[self _touch];
|
||||
}
|
||||
else
|
||||
NSLog(@"customClass not found %@",oldName);
|
||||
|
|
|
@ -17,9 +17,6 @@
|
|||
self = [super init];
|
||||
if (self != nil)
|
||||
{
|
||||
// initialize all member variables...
|
||||
// none...
|
||||
|
||||
// load the gui...
|
||||
if (![NSBundle loadNibNamed: @"GormImageInspector"
|
||||
owner: self])
|
||||
|
@ -42,22 +39,23 @@
|
|||
- (void) dealloc
|
||||
{
|
||||
[[NSNotificationCenter defaultCenter] removeObserver: self];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (void) handleNotification: (NSNotification*)aNotification
|
||||
{
|
||||
}
|
||||
|
||||
- (void) setObject: (id)aobject
|
||||
- (void) setObject: (id)anObject
|
||||
{
|
||||
NSImage *image = [aobject normalImage];
|
||||
NSImage *image = [anObject normalImage];
|
||||
NSSize size = [image size];
|
||||
|
||||
object = aobject;
|
||||
[super setObject: anObject];
|
||||
[imageView setImageAlignment: NSImageAlignCenter];
|
||||
[imageView setImageFrameStyle: NSImageFrameGrayBezel];
|
||||
[imageView setImageScaling: NSScaleNone];
|
||||
[imageView setImage: [aobject image]];
|
||||
[imageView setImage: [anObject image]];
|
||||
[name setStringValue: [image name]];
|
||||
[width setDoubleValue: size.width];
|
||||
[height setDoubleValue: size.height];
|
||||
|
|
|
@ -145,6 +145,12 @@
|
|||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void) setObject: (id)anObject
|
||||
{
|
||||
object = nil;
|
||||
[super setObject: anObject];
|
||||
}
|
||||
@end
|
||||
|
||||
|
||||
|
@ -1119,7 +1125,7 @@ selectCellWithString: (NSString*)title
|
|||
{
|
||||
NSArray *array;
|
||||
|
||||
ASSIGN(object, anObject);
|
||||
[super setObject: anObject];
|
||||
DESTROY(currentConnector);
|
||||
RELEASE(connectors);
|
||||
|
||||
|
|
|
@ -129,9 +129,6 @@ static NSMapTable *docMap = 0;
|
|||
{
|
||||
NSNotificationCenter *nc;
|
||||
|
||||
// && [[document nameForObject: selected] isEqualToString: @"NSFont"] == NO)
|
||||
// we need to check to see if the NSFont object has any connections...
|
||||
|
||||
nc = [NSNotificationCenter defaultCenter];
|
||||
|
||||
if ([selected isKindOfClass: [NSMenu class]] &&
|
||||
|
|
|
@ -90,6 +90,10 @@
|
|||
sndobject = [selection objectAtIndex: 0];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
_currentSound = nil;
|
||||
}
|
||||
|
||||
// if its not nil, load it...
|
||||
if(sndobject != nil)
|
||||
|
|
Binary file not shown.
Loading…
Reference in a new issue