gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 12:55:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAdaptors/SQLiteAdaptor/SQLite3SQLExpression.m: Override

Browse source 
createDatabase method.
        * configure: Regenerate.
        * configure.ac: Change SUBPROJECTS to GUI_SUBPROJECTS to reflect 
	what its for.
        * GNUmakefile.in: Ditto, and move so its compiled after EOInterface
        * EOModeler/EOMInspector.h: Add IBOutlets.
        * DBModeler/Inspectors/AttributeInspector.m: Remove unused ivar.
        * DBModeler/Inspectors/GNUmakefile: Add AdvancedEntityInspector.
        * DBModeler/Inspectors/AdvancedEntityInspector.[h,m,gorm]: New 	files.
        * DBModeler/GNUmakefile: Remove subprojects hack.
        * GDL2Palette/GNUmakefile: Ditto.
        * GDL2Palette/ResourceManager.m: enable the creation of parent
        assocation when creating a EOMasterDetailDisplayGroup.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@23694 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ratmice 2006-10-01 13:04:05 +00:00
parent 9e688c485d
commit fe95eba38e
16 changed files with 169 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -5,6 +5,21 @@
* config/sqlite3.m4: New file.
* configure.ac: Add detection for sqlite3.
* EOAdaptors/SQLiteAdaptor/SQLite3SQLExpression.m: Override
createDatabase method.
* configure: Regenerate.
* configure.ac: Change SUBPROJECTS to GUI_SUBPROJECTS to reflect what
its for.
* GNUmakefile.in: Ditto, and move so its compiled after EOInterface
* EOModeler/EOMInspector.h: Add IBOutlets.
* DBModeler/Inspectors/AttributeInspector.m: Remove unused ivar.
* DBModeler/Inspectors/GNUmakefile: Add AdvancedEntityInspector.
* DBModeler/Inspectors/AdvancedEntityInspector.[h,m,gorm]: New files.
* DBModeler/GNUmakefile: Remove subprojects hack.
* GDL2Palette/GNUmakefile: Ditto.
* GDL2Palette/ResourceManager.m: enable the creation of parent
assocation when creating a EOMasterDetailDisplayGroup.
2006-09-28 Matt Rice <ratmice@yahoo.com>
* EOAccess/EOSQLExpression.m

3
DBModeler/GNUmakefile
View file

@ -28,9 +28,6 @@ GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
include $(GNUSTEP_MAKEFILES)/common.make
SUBPROJECTS=../EOInterface ../EOModeler
include $(GNUSTEP_MAKEFILES)/aggregate.make
APP_NAME = DBModeler
DBModeler_SUBPROJECTS=Inspectors

33
DBModeler/Inspectors/AdvancedEntityInspector.gorm/data.classes Normal file
View file

@ -0,0 +1,33 @@
{
"## Comment" = "Do NOT change this file, Gorm maintains it";
AdvancedEntityInspector = {
Actions = (
"setAbstractAction:",
"setReadOnlyAction:",
"setCachesObjectsAction:"
);
Outlets = (
abstract,
readOnly,
cachesObjects
);
Super = EOMInspector;
};
EOMInspector = {
Actions = (
);
Outlets = (
window,
view
);
Super = NSObject;
};
FirstResponder = {
Actions = (
"setCachesObjectsAction:",
"setAbstractAction:",
"setReadOnlyAction:"
);
Super = NSObject;
};
}

BIN
DBModeler/Inspectors/AdvancedEntityInspector.gorm/data.info Normal file
View file

Binary file not shown.

BIN
DBModeler/Inspectors/AdvancedEntityInspector.gorm/objects.gorm Normal file
View file

Binary file not shown.

38
DBModeler/Inspectors/AdvancedEntityInspector.h Normal file
View file

@ -0,0 +1,38 @@
/*
AdvancedEntityInspector.h
Author: Matt Rice <ratmice@yahoo.com>
Date: 2005, 2006
This file is part of DBModeler.
DBModeler 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.
DBModeler 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 DBModeler; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <AppKit/NSNibDeclarations.h>
#include <EOModeler/EOMInspector.h>
@class NSButton;
@interface AdvancedEntityInspector : EOMInspector
{
IBOutlet NSButton *abstract;
IBOutlet NSButton *readOnly;
IBOutlet NSButton *cachesObjects;
}
- (IBAction) setAbstractAction:(id)sender;
- (IBAction) setReadOnlyAction:(id)sender;
- (IBAction) setCachesObjectsAction:(id)sender;
@end

58
DBModeler/Inspectors/AdvancedEntityInspector.m Normal file
View file

@ -0,0 +1,58 @@
/*
AdvancedEntityInspector.m
Author: Matt Rice <ratmice@yahoo.com>
Date: 2005, 2006
This file is part of DBModeler.
DBModeler 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.
DBModeler 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 DBModeler; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "AdvancedEntityInspector.h"
#include <EOModeler/EOMInspector.h>
#include <EOAccess/EOEntity.h>
#include <AppKit/NSButton.h>
#include <Foundation/NSValue.h>
@implementation AdvancedEntityInspector
- (void) setReadOnlyAction:(id)sender
{
[(EOEntity *)[self selectedObject] setReadOnly:[readOnly state] == NSOnState ? YES : NO];
}
- (void) setAbstractAction:(id)sender
{
[(EOEntity *)[self selectedObject] setIsAbstractEntity:[abstract state] == NSOnState ? YES : NO];
}
- (void) setCachesObjectsAction:(id)sender
{
[(EOEntity *)[self selectedObject] setCachesObjects:[cachesObjects state] == NSOnState ? YES : NO];
}
- (void) refresh
{
[abstract setState:[(EOEntity *)[self selectedObject] isAbstractEntity] ? NSOnState : NSOffState];
[readOnly setState:[(EOEntity *)[self selectedObject] isReadOnly] ? NSOnState : NSOffState];
[cachesObjects setState:[(EOEntity *)[self selectedObject] cachesObjects] ? NSOnState : NSOffState];
}
- (BOOL) canInspectObject:(id)anObject
{
return [anObject isKindOfClass:[EOEntity class]];
}
@end

1
DBModeler/Inspectors/AttributeInspector.m
View file

@ -86,7 +86,6 @@
- (NSString *) _titleForPopUp
{
NSString *vcn = [(EOAttribute *)[self selectedObject] valueClassName];
NSString *valueType = [(EOAttribute *)[self selectedObject] valueType];
NSString *ret;
ret = [_classTitleDict objectForKey:vcn];

3
DBModeler/Inspectors/GNUmakefile
View file

@ -40,4 +40,7 @@ Inspectors_OBJC_FILES+=RelationshipInspector.m
Inspectors_RESOURCE_FILES+=AttributeInspector.gorm
Inspectors_OBJC_FILES+=AttributeInspector.m
Inspectors_RESOURCE_FILES+=AdvancedEntityInspector.gorm
Inspectors_OBJC_FILES+=AdvancedEntityInspector.m
include $(GNUSTEP_MAKEFILES)/subproject.make

6
EOAdaptors/SQLiteAdaptor/SQLite3Expression.m
View file

@ -149,6 +149,12 @@ static NSString *escapeString(NSString *value)
return [NSArray array];
}
+ (NSArray *)createDatabaseStatementsForConnectionDictionary: (NSDictionary *)connDict
administrativeConnectionDictionary: (NSDictionary *)admConnDict
{
return [NSArray array];
}
// TODO find a better way to do this?
+ (NSArray *)primaryKeyConstraintStatementsForEntityGroup:(NSArray *)entityGroup
{

7
EOModeler/EOMInspector.h
View file

@ -26,6 +26,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <AppKit/NSNibDeclarations.h>
#include <Foundation/NSObject.h>
@class NSArray;
@ -35,9 +36,9 @@
@interface EOMInspector : NSObject
{
NSImage *image;
NSView *view;
NSWindow *window;
IBOutlet NSImage *image;
IBOutlet NSView *view;
IBOutlet NSWindow *window;
}
+ (NSArray *)allRegisteredInspectors;
+ (NSArray *)allInspectorsThatCanInspectObject:(id)anObject;

3
GDL2Palette/GNUmakefile
View file

@ -32,9 +32,6 @@ include ../gdl2.make
PALETTE_NAME=GDL2
GDL2_PRINCIPAL_CLASS = GDL2Palette
SUBPROJECTS+=../EOModeler ../EOInterface
include $(GNUSTEP_MAKEFILES)/aggregate.make
ADDITIONAL_INCLUDE_DIRS+=-I../
ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler
ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl EOInterface EOModeler

9
GDL2Palette/ResourceManager.m
View file

@ -175,7 +175,7 @@
[[(id<IB>)NSApp activeDocument] addConnector: dsConn];
ds = [ds dataSourceQualifiedByKey:relName];
[detailDG setDataSource:ds];
/*
assoc = [[EOMasterDetailAssociation alloc] initWithObject:detailDG];
[assoc bindAspect:@"parent"
displayGroup:masterDG
@ -183,10 +183,9 @@
conn = [[EOAspectConnector alloc] initWithAssociation:assoc
aspectName:@"parent"];
[conn setSource:masterDG];
[conn setDestination:detailDG];
[conn setLabel:[NSString stringWithFormat:@"parent - %@",[pList objectAtIndex:2]]];
*/
[conn setSource:masterDG];
[conn setDestination:detailDG];
[conn setLabel:[NSString stringWithFormat:@"parent - %@",[pList objectAtIndex:2]]];
dsConn = [[NSNibOutletConnector alloc] init];
[dsConn setSource:ds];

2
GNUmakefile.in
View file

@ -39,7 +39,7 @@ SVN_BASE_URL=http://svn.gna.org/svn/gnustep/libs
SUBPROJECTS = EOControl EOAccess EOAdaptors Tools
ifeq ($(GUI_MAKE_LOADED),yes)
SUBPROJECTS += @SUBPROJECTS@ EOInterface EOModeler DBModeler
SUBPROJECTS += EOInterface EOModeler DBModeler @GUI_SUBPROJECTS@
endif
DOCUMENT_NAME = GDL2

8
configure vendored
View file

@ -308,7 +308,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PG_CONFIG CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP POSTGRES_DATABASE POSTGRES_INCLUDES POSTGRES_LIB_DIRS POSTGRES_LIBS PKGCONFIG SQLITE3_DATABASE SQLITE3_INCLUDES SQLITE3_LIB_DIRS SQLITE3_LIBS EOADAPTORS SUBPROJECTS VERSION MAJOR_VERSION MINOR_VERSION SUBMINOR_VERSION GCC_VERSION LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PG_CONFIG CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP POSTGRES_DATABASE POSTGRES_INCLUDES POSTGRES_LIB_DIRS POSTGRES_LIBS PKGCONFIG SQLITE3_DATABASE SQLITE3_INCLUDES SQLITE3_LIB_DIRS SQLITE3_LIBS EOADAPTORS GUI_SUBPROJECTS VERSION MAJOR_VERSION MINOR_VERSION SUBMINOR_VERSION GCC_VERSION LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -3552,9 +3552,9 @@ if test "${enable_gorm_palette+set}" = set; then
else
enable_gorm_palette=yes
fi;
SUBPROJECTS=""
GUI_SUBPROJECTS=""
if test "$enable_gorm_palette" = "yes"; then
SUBPROJECTS="$SUBPROJECTS GDL2Palette"
GUI_SUBPROJECTS="$GUI_SUBPROJECTS GDL2Palette"
fi
@ -4214,7 +4214,7 @@ s,@SQLITE3_INCLUDES@,$SQLITE3_INCLUDES,;t t
s,@SQLITE3_LIB_DIRS@,$SQLITE3_LIB_DIRS,;t t
s,@SQLITE3_LIBS@,$SQLITE3_LIBS,;t t
s,@EOADAPTORS@,$EOADAPTORS,;t t
s,@SUBPROJECTS@,$SUBPROJECTS,;t t
s,@GUI_SUBPROJECTS@,$GUI_SUBPROJECTS,;t t
s,@VERSION@,$VERSION,;t t
s,@MAJOR_VERSION@,$MAJOR_VERSION,;t t
s,@MINOR_VERSION@,$MINOR_VERSION,;t t

6
configure.ac
View file

@ -69,11 +69,11 @@ AC_SUBST(EOADAPTORS)
AC_ARG_ENABLE(gorm-palette,
[ --disable-gorm-palette to disable building gorm palette], ,
enable_gorm_palette=yes)
SUBPROJECTS=""
GUI_SUBPROJECTS=""
if test "$enable_gorm_palette" = "yes"; then
SUBPROJECTS="$SUBPROJECTS GDL2Palette"
GUI_SUBPROJECTS="$GUI_SUBPROJECTS GDL2Palette"
fi
AC_SUBST(SUBPROJECTS)
AC_SUBST(GUI_SUBPROJECTS)
#--------------------------------------------------------------------
# Record the version