From 460fda5fa8834b305ad8c2a7bd45edf4fe2d5153 Mon Sep 17 00:00:00 2001 From: Matt Rice Date: Fri, 29 Dec 2006 00:09:01 +0000 Subject: [PATCH] * EOAdaptors/PostgreSQL/LoginPanel/GNUmakefile: Fix path to NATIVE_LIB_DIRS. * GDL2Palette/DisplayGroupInspector.m: Call super dealloc. * GDL2Palette/ResourceManager.m: Add comment. * DBModeler/DefaultColumnProvider: Set switch buttons to ineditable. * ChangeLog: Add missing entries... git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@24291 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 19 +++++++++++++++++++ DBModeler/DefaultColumnProvider.m | 14 ++++++-------- .../PostgreSQLAdaptor/LoginPanel/GNUmakefile | 2 +- GDL2Palette/DisplayGroupInspector.m | 1 + GDL2Palette/ResourceManager.m | 1 + 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70f4b19..b0e7b27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2006-12-28 Matt Rice + + * EOAdaptors/PostgreSQL/LoginPanel/GNUmakefile: Fix path to + NATIVE_LIB_DIRS. + * GDL2Palette/DisplayGroupInspector.m: Call super dealloc. + * GDL2Palette/ResourceManager.m: Add comment. + * DBModeler/DefaultColumnProvider: Set switch buttons to ineditable. + * ChangeLog: Add missing entries... + +2006-12-26 Matt Rice + + * EOModeler/EOModelerDocument.m (-saveToPath:): Handle saving with a + .eomodel extension. + * EOAccess/EOEntity.m (-dealloc): Only set parents to nil + properties which have been fully loaded. + * EOAdaptors/PostgreSQL/LoginPanel/GNUmakefile: Remove references to + libgnustep-db2control/access + * DBModeler/MainModelEditor.m: Set the windows title. + 2006-11-16 Matt Rice * EOControl/EOObserver.m: Use an NSHashTable to store observers. diff --git a/DBModeler/DefaultColumnProvider.m b/DBModeler/DefaultColumnProvider.m index 57217d3..0022a65 100644 --- a/DBModeler/DefaultColumnProvider.m +++ b/DBModeler/DefaultColumnProvider.m @@ -204,7 +204,7 @@ void registerColumnsForClass(struct column_info columns[], int count, Class aCla [cell setBezeled:NO]; [cell setAlternateImage:[NSImage imageNamed:@"Key_On"]]; [cell setControlSize: NSSmallControlSize]; - [cell setEditable:YES]; + [cell setEditable:NO]; return AUTORELEASE(cell); } else if ([name isEqual:@"Class property"]) @@ -217,7 +217,7 @@ void registerColumnsForClass(struct column_info columns[], int count, Class aCla [cell setBezeled:NO]; [cell setAlternateImage:[NSImage imageNamed:@"ClassProperty_On"]]; [cell setControlSize: NSSmallControlSize]; - [cell setEditable:YES]; + [cell setEditable:NO]; return AUTORELEASE(cell); } else if ([name isEqual:@"Locking"]) @@ -230,7 +230,7 @@ void registerColumnsForClass(struct column_info columns[], int count, Class aCla [cell setBezeled:NO]; [cell setAlternateImage:[NSImage imageNamed:@"Locking_On"]]; [cell setControlSize: NSSmallControlSize]; - [cell setEditable:YES]; + [cell setEditable:NO]; return AUTORELEASE(cell); } else if ([name isEqual:@"Allows null"]) @@ -243,15 +243,13 @@ void registerColumnsForClass(struct column_info columns[], int count, Class aCla [cell setBezeled:NO]; [cell setAlternateImage:[NSImage imageNamed:@"AllowsNull_On"]]; [cell setControlSize: NSSmallControlSize]; - [cell setEditable:YES]; + [cell setEditable:NO]; return AUTORELEASE(cell); } else { - NSTextFieldCell *cell = [[NSTextFieldCell alloc] initTextCell:@""]; - [cell setEnabled:YES]; + NSTextFieldCell *cell = [[NSTextFieldCell alloc] init]; [cell setEditable:YES]; - [cell setScrollable: YES]; return AUTORELEASE(cell); } } @@ -271,7 +269,7 @@ void registerColumnsForClass(struct column_info columns[], int count, Class aCla aspect = @"value"; association = [[EOColumnAssociation alloc] initWithObject:tc]; cell = [self cellForColumnNamed:columnName]; - [tc setEditable:[cell isEditable]]; + [tc setEditable: [cell isEditable]]; [tc setDataCell:cell]; [self setupTitleForColumn:tc named:columnName]; [association bindAspect:aspect displayGroup:displayGroup key:aspectKey]; diff --git a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile index e131da5..951eba5 100644 --- a/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile +++ b/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile @@ -40,7 +40,7 @@ LoginPanel_PRINCIPAL_CLASS = PostgreSQLLoginPanel LoginPanel_INCLUDE_DIRS = -I.. -I../../.. ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl -ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess +ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess ifneq ($(FOUNDATION_LIB),gnu) LoginPanel_OBJC_LIBS += -lgnustep-baseadd diff --git a/GDL2Palette/DisplayGroupInspector.m b/GDL2Palette/DisplayGroupInspector.m index e43ec9e..41397f4 100644 --- a/GDL2Palette/DisplayGroupInspector.m +++ b/GDL2Palette/DisplayGroupInspector.m @@ -41,6 +41,7 @@ - (void) dealloc { RELEASE(_localKeys); + [super dealloc]; } -(IBAction) setValidatesImmediately:(id)sender; diff --git a/GDL2Palette/ResourceManager.m b/GDL2Palette/ResourceManager.m index 98c6928..6760d11 100644 --- a/GDL2Palette/ResourceManager.m +++ b/GDL2Palette/ResourceManager.m @@ -57,6 +57,7 @@ - (void) didOpenDocument:(NSNotification *)notif { + /* this should probably use a different model group for each gorm document */ NSArray *tmp; NSMutableArray *modelPaths = [NSMutableArray new]; NSString *docPath;