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

Worked on getting the menus to work properly on OS X. Other minor fixes.

Browse source 
* Modeler.m

  Changed use of the NSMenuItem protocol to the NSMenuItem class.  The
  NSMenuItem protocol is deprecated as of OS X 10.5.

  Modified the menu creation code so that it creates a native-looking menu on
  OS X.  Added a top-level app menu, as well as a services menu.

  Whitespace clean-up.  Changed everything to spaces.

* AttributeCell.m

  (drawWithFrame:inView:): Changed access of instance variable to use an
  accessor method instead for showsFirstResponder.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26513 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Blake Nicholson 2008-05-12 02:58:33 +00:00
parent b7e35aec2b
commit 94d86a2b8e
3 changed files with 149 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -3,6 +3,17 @@
* GNUmakefile.in: Add EOInterface, EOModeler, and DBModeler to * GNUmakefile.in: Add EOInterface, EOModeler, and DBModeler to
SUBPROJECTS if GUI_LIB is apple. SUBPROJECTS if GUI_LIB is apple.
* Modeler.m: Changed use of the NSMenuItem protocol to the NSMenuItem class.
The NSMenuItem protocol is deprecated as of OS X 10.5.
Modified the menu creation code so that it creates a native-looking menu on
OS X. Added a top-level app menu, as well as a services menu.
Whitespace clean-up. Changed everything to spaces.
* AttributeCell.m (drawWithFrame:inView:): Changed access of instance
variable to use an accessor method instead for showsFirstResponder.
2008-05-09 Blake Nicholson <blaken@umich.edu> 2008-05-09 Blake Nicholson <blaken@umich.edu>
* DBModeler/*.[h,m]: Fix includes for OS X. * DBModeler/*.[h,m]: Fix includes for OS X.

2
DBModeler/AttributeCell.m
View file

@ -139,7 +139,7 @@
if (isProp) if (isProp)
[prop drawWithFrame:NSMakeRect(frame.size.width - 54, frame.origin.y + 2, 9, 8) inView:view]; [prop drawWithFrame:NSMakeRect(frame.size.width - 54, frame.origin.y + 2, 9, 8) inView:view];
if (_cell.shows_first_responder) if ([self showsFirstResponder])
{ {
NSFrameRect(frame); NSFrameRect(frame);
} }

232
DBModeler/Modeler.m
View file

@ -71,19 +71,19 @@
} }
@end @end
@interface NSMenu (im_lazy) @interface NSMenu (im_lazy)
-(id <NSMenuItem>) addItemWithTitle: (NSString *)s; - (NSMenuItem *)addItemWithTitle: (NSString *)s;
-(id <NSMenuItem>) addItemWithTitle: (NSString *)s action: (SEL)sel; - (NSMenuItem *)addItemWithTitle: (NSString *)s action: (SEL)sel;
@end @end
@implementation NSMenu (im_lazy) @implementation NSMenu (im_lazy)
-(id <NSMenuItem>) addItemWithTitle: (NSString *)s - (NSMenuItem *)addItemWithTitle: (NSString *)s
{ {
return [self addItemWithTitle: s action: NULL keyEquivalent: nil]; return [self addItemWithTitle: s action: nil keyEquivalent: @""];
} }
-(id <NSMenuItem>) addItemWithTitle: (NSString *)s action: (SEL)sel - (NSMenuItem *)addItemWithTitle: (NSString *)s action: (SEL)sel
{ {
return [self addItemWithTitle: s action: sel keyEquivalent: nil]; return [self addItemWithTitle: s action: sel keyEquivalent: @""];
} }
@end @end
@ -100,14 +100,14 @@
int i,c; int i,c;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSArray *bundlesToLoad = RETAIN([defaults arrayForKey: @"BundlesToLoad"]); NSArray *bundlesToLoad = RETAIN([defaults arrayForKey: @"BundlesToLoad"]);
NSMenu *mainMenu,*subMenu; NSMenu *mainMenu,*subMenu,*servicesMenu;
NSFileManager *fm = [NSFileManager defaultManager]; NSFileManager *fm = [NSFileManager defaultManager];
// [EOObserverCenter addOmniscientObserver:[DebugObserver new]]; // [EOObserverCenter addOmniscientObserver:[DebugObserver new]];
[[NSNotificationCenter defaultCenter] addObserver:self [[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(bundleDidLoad:) selector:@selector(bundleDidLoad:)
name:NSBundleDidLoadNotification name:NSBundleDidLoadNotification
object:nil]; object:nil];
for (i=0, c = [bundlesToLoad count]; i < c; i++) for (i=0, c = [bundlesToLoad count]; i < c; i++)
{ {
BOOL isDir; BOOL isDir;
@ -127,125 +127,167 @@
mainMenu = [[NSMenu alloc] init]; mainMenu = [[NSMenu alloc] init];
[mainMenu setAutoenablesItems:YES]; [mainMenu setAutoenablesItems:YES];
subMenu = [[NSMenu alloc] init];
subMenu = [[NSMenu alloc] initWithTitle: _(@"Info")];
[subMenu setAutoenablesItems:YES]; [subMenu setAutoenablesItems:YES];
[subMenu addItemWithTitle: _(@"Info...") [subMenu addItemWithTitle: _(@"About DBModeler")
action: @selector(orderFrontStandardInfoPanel:)]; action: nil];
[subMenu addItem: [NSMenuItem separatorItem]];
[subMenu addItemWithTitle: _(@"Preferences...") [subMenu addItemWithTitle: _(@"Preferences...")
action: @selector(openPrefs:)]; action: @selector(openPrefs:)
keyEquivalent: @","];
[mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle: _(@"Info")]]; #ifdef NeXT_GUI_LIBRARY
[subMenu addItem: [NSMenuItem separatorItem]];
servicesMenu = [[NSMenu alloc] initWithTitle: _(@"Services")];
[subMenu setSubmenu: servicesMenu forItem: [subMenu addItemWithTitle: _(@"Services")]];
[NSApp setServicesMenu: servicesMenu];
[servicesMenu release];
[subMenu addItem: [NSMenuItem separatorItem]];
[subMenu addItemWithTitle: _(@"Hide DBModeler")
action: @selector(hide:)
keyEquivalent: @"h"];
[subMenu addItemWithTitle: _(@"Hide Others")
action: @selector(hideOtherApplications:)
keyEquivalent: @""];
[subMenu addItemWithTitle: _(@"Show All")
action: @selector(unhideAllApplications:)
keyEquivalent: @""];
[subMenu addItem: [NSMenuItem separatorItem]];
[subMenu addItemWithTitle: _(@"Quit DBModeler")
action: @selector(terminate:)
keyEquivalent: @"q"];
#endif /* NeXT_GUI_LIBRARY */
[mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle: @"Info"]];
[subMenu release]; [subMenu release];
subMenu = [[NSMenu alloc] init]; subMenu = [[NSMenu alloc] initWithTitle: _(@"Model")];
[subMenu addItemWithTitle: _(@"New...") [subMenu addItemWithTitle: _(@"New...")
action: @selector(new:) action: @selector(new:)
keyEquivalent: @"n"]; keyEquivalent: @"n"];
[subMenu addItemWithTitle: _(@"New from databse...") [subMenu addItemWithTitle: _(@"New From Database...")
action: @selector(newFromDatabase:) action: @selector(newFromDatabase:)
keyEquivalent: @""]; keyEquivalent: @""];
[subMenu addItemWithTitle: _(@"Open") [subMenu addItemWithTitle: _(@"Open")
action: @selector(open:) action: @selector(open:)
keyEquivalent: @"o"]; keyEquivalent: @"o"];
[subMenu addItem:[NSMenuItem separatorItem]];
[subMenu addItemWithTitle: _(@"Save") [subMenu addItemWithTitle: _(@"Save")
action: @selector(save:) action: @selector(save:)
keyEquivalent: @""]; keyEquivalent: @"s"];
[subMenu addItemWithTitle: _(@"Save As") [subMenu addItemWithTitle: _(@"Save As...")
action: @selector(saveAs:) action: @selector(saveAs:)
keyEquivalent: @""]; keyEquivalent: @"S"];
[subMenu addItemWithTitle: _(@"Revert") [subMenu addItemWithTitle: _(@"Revert to Saved")
action: @selector(revert:) action: @selector(revert:)
keyEquivalent: @""]; keyEquivalent: @"u"];
[subMenu addItemWithTitle: _(@"Set Adaptor Info") [subMenu addItem:[NSMenuItem separatorItem]];
[subMenu addItemWithTitle: _(@"Set Adaptor Info...")
action: @selector(setAdaptor:) action: @selector(setAdaptor:)
keyEquivalent: @""]; keyEquivalent: @"I"];
[subMenu addItemWithTitle: _(@"Switch Adaptor") [subMenu addItemWithTitle: _(@"Switch Adaptor...")
action: @selector(switchAdaptor:) action: @selector(switchAdaptor:)
keyEquivalent: @""]; keyEquivalent: @""];
[ConsistencyChecker class]; [ConsistencyChecker class];
[[subMenu addItemWithTitle: _(@"Check consistency") [[subMenu addItemWithTitle: _(@"Check Consistency...")
action: @selector(checkConsistency:) action: @selector(checkConsistency:)
keyEquivalent: @""] setRepresentedObject:[ConsistencyResults sharedConsistencyPanel]]; keyEquivalent: @""] setRepresentedObject:[ConsistencyResults sharedConsistencyPanel]];
[mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle:_(@"Model")]]; [mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle:_(@"Model")]];
[subMenu release]; [subMenu release];
subMenu = [[NSMenu alloc] init]; subMenu = [[NSMenu alloc] initWithTitle: _(@"Edit")];
subMenu = [[NSMenu alloc] init];
[subMenu setAutoenablesItems:YES]; [subMenu setAutoenablesItems:YES];
[subMenu addItemWithTitle: _(@"Copy") [subMenu addItemWithTitle: _(@"Copy")
action: @selector(copy:) action: @selector(copy:)
keyEquivalent:@"c"]; keyEquivalent: @"c"];
[subMenu addItemWithTitle: _(@"Cut") [subMenu addItemWithTitle: _(@"Cut")
action: @selector(cut:) action: @selector(cut:)
keyEquivalent:@"x"]; keyEquivalent: @"x"];
[subMenu addItemWithTitle: _(@"Paste") [subMenu addItemWithTitle: _(@"Paste")
action: @selector(paste:) action: @selector(paste:)
keyEquivalent:@"v"]; keyEquivalent: @"v"];
[mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle: _(@"Edit")]]; [mainMenu setSubmenu: subMenu forItem: [mainMenu addItemWithTitle: _(@"Edit")]];
[subMenu release]; [subMenu release];
subMenu = [[NSMenu alloc] init]; subMenu = [[NSMenu alloc] initWithTitle: _(@"Tools")];
[subMenu addItemWithTitle:_(@"Inspector") [subMenu addItemWithTitle: _(@"Inspector")
action: @selector(showInspector:) action: @selector(showInspector:)
keyEquivalent: @"i"]; keyEquivalent: @"i"];
[subMenu addItemWithTitle: _(@"Generate SQL") [subMenu addItemWithTitle: _(@"Generate SQL")
action: @selector(generateSQL:) action: @selector(generateSQL:)
keyEquivalent: @""]; keyEquivalent: @""];
[subMenu addItemWithTitle: _(@"Table Editor") [subMenu addItemWithTitle: _(@"Table Editor")
action: @selector(showEditor:) action: @selector(showEditor:)
keyEquivalent:@""]; keyEquivalent: @""];
[subMenu addItemWithTitle: _(@"Diagram Editor") [subMenu addItemWithTitle: _(@"Diagram Editor")
action: @selector(showEditor:) action: @selector(showEditor:)
keyEquivalent:@""]; keyEquivalent: @""];
[mainMenu setSubmenu:subMenu forItem:[mainMenu addItemWithTitle:_(@"Tools")]]; [mainMenu setSubmenu:subMenu forItem:[mainMenu addItemWithTitle:_(@"Tools")]];
[subMenu release]; [subMenu release];
subMenu = [[NSMenu alloc] init]; subMenu = [[NSMenu alloc] initWithTitle: _(@"Property")];
[subMenu setAutoenablesItems:YES]; [subMenu setAutoenablesItems:YES];
[subMenu addItemWithTitle: _(@"Add entity") [subMenu addItemWithTitle: _(@"Add Entity")
action: @selector(addEntity:) action: @selector(addEntity:)
keyEquivalent: @"e"]; keyEquivalent: @"E"];
[subMenu addItemWithTitle: _(@"Add attribute") [subMenu addItemWithTitle: _(@"Add Attribute")
action: @selector(addAttribute:) action: @selector(addAttribute:)
keyEquivalent: @"a"]; keyEquivalent: @"A"];
[subMenu addItemWithTitle: _(@"Add relationship") [subMenu addItemWithTitle: _(@"Add Relationship")
action: @selector(addRelationship:) action: @selector(addRelationship:)
keyEquivalent: @"r"]; keyEquivalent: @"R"];
[subMenu addItemWithTitle: _(@"delete")
[subMenu addItemWithTitle: _(@"Delete")
action: @selector(delete:) action: @selector(delete:)
keyEquivalent: @""]; keyEquivalent: @""];
[mainMenu setSubmenu:subMenu forItem:[mainMenu addItemWithTitle:_(@"Property")]]; [mainMenu setSubmenu:subMenu forItem:[mainMenu addItemWithTitle:_(@"Property")]];
[subMenu release]; [subMenu release];
#ifdef GNU_GUI_LIBRARY
servicesMenu = [[NSMenu alloc] initWithTitle: _(@"Services")];
[mainMenu setSubmenu: servicesMenu forItem: [mainMenu addItemWithTitle: _(@"Services")]];
[NSApp setServicesMenu: servicesMenu];
[servicesMenu release];
[mainMenu addItemWithTitle: _(@"Hide") [mainMenu addItemWithTitle: _(@"Hide")
action: @selector(hide:) action: @selector(hide:)
keyEquivalent: @"h"]; keyEquivalent: @"h"];
[mainMenu addItemWithTitle: _(@"Quit...") [mainMenu addItemWithTitle: _(@"Quit...")
action: @selector(terminate:) action: @selector(terminate:)
keyEquivalent: @"q"]; keyEquivalent: @"q"];
#endif /* GNU_GUI_LIBRARY */
[NSApp setMainMenu: mainMenu]; [NSApp setMainMenu: mainMenu];
/* make this a default? */ /* make this a default? */
[EOModelerDocument setDefaultEditorClass: NSClassFromString(@"MainModelEditor")]; [EOModelerDocument setDefaultEditorClass: NSClassFromString(@"MainModelEditor")];
@ -279,7 +321,7 @@
- (void)new:(id)sender - (void)new:(id)sender
{ {
EOModel *newModel = [[EOModel alloc] init]; EOModel *newModel = [[EOModel alloc] init];
NSString *modelName; NSString *modelName;
NSArray *docs = [EOMApp documents]; NSArray *docs = [EOMApp documents];
unsigned docNumber, c, i; unsigned docNumber, c, i;
@ -339,18 +381,18 @@
connDict = [adaptor runLoginPanel]; connDict = [adaptor runLoginPanel];
if (connDict) if (connDict)
{ {
[adaptor setConnectionDictionary:[adaptor runLoginPanel]]; [adaptor setConnectionDictionary:[adaptor runLoginPanel]];
ctxt = [adaptor createAdaptorContext]; ctxt = [adaptor createAdaptorContext];
channel = [ctxt createAdaptorChannel]; channel = [ctxt createAdaptorChannel];
[channel openChannel]; [channel openChannel];
newModel = [channel describeModelWithTableNames:[channel describeTableNames]]; newModel = [channel describeModelWithTableNames:[channel describeTableNames]];
[newModel setConnectionDictionary:[adaptor connectionDictionary]]; [newModel setConnectionDictionary:[adaptor connectionDictionary]];
[newModel setName: [[adaptor connectionDictionary] objectForKey:@"databaseName"]]; [newModel setName: [[adaptor connectionDictionary] objectForKey:@"databaseName"]];
[channel closeChannel]; [channel closeChannel];
[self _newDocumentWithModel:newModel]; [self _newDocumentWithModel:newModel];
RELEASE(newModel); RELEASE(newModel);
} }
} }
} }
@ -393,23 +435,23 @@
BOOL flag; BOOL flag;
#if 0 #if 0
NSLog(@"%@ %@ %i %i %i %i %i", NSStringFromSelector(_cmd), filename, NSLog(@"%@ %@ %i %i %i %i %i", NSStringFromSelector(_cmd), filename,
[fm isReadableFileAtPath:filename] == YES, [fm isReadableFileAtPath:filename] == YES,
[pathExt isEqual:@"eomodel"], [pathExt isEqual:@"eomodel"],
[pathExt isEqual:@"eomodeld"], [pathExt isEqual:@"eomodeld"],
[fm fileExistsAtPath:filename isDirectory:&flag], [fm fileExistsAtPath:filename isDirectory:&flag],
flag); flag);
#endif #endif
if (([fm isReadableFileAtPath:filename] == YES if (([fm isReadableFileAtPath:filename] == YES
&& [pathExt isEqual:@"eomodel"]) && [pathExt isEqual:@"eomodel"])
|| ([pathExt isEqual:@"eomodeld"] || ([pathExt isEqual:@"eomodeld"]
&& [fm fileExistsAtPath:filename isDirectory:&flag] && flag)) && [fm fileExistsAtPath:filename isDirectory:&flag] && flag))
{ {
EOModel *model; EOModel *model;
NS_DURING NS_DURING
model = [[EOModel alloc] initWithContentsOfFile:filename]; model = [[EOModel alloc] initWithContentsOfFile:filename];
NS_HANDLER NS_HANDLER
return NO; return NO;
NS_ENDHANDLER NS_ENDHANDLER
[self _newDocumentWithModel:model]; [self _newDocumentWithModel:model];
@ -431,25 +473,25 @@
for (i = 0, c = [modelPaths count]; i < c; i++) for (i = 0, c = [modelPaths count]; i < c; i++)
{ {
NSString *modelPath = [modelPaths objectAtIndex:i]; NSString *modelPath = [modelPaths objectAtIndex:i];
NSString *pathExt = [[modelPath pathExtension] lowercaseString]; NSString *pathExt = [[modelPath pathExtension] lowercaseString];
if ([fm isReadableFileAtPath:modelPath] == YES if ([fm isReadableFileAtPath:modelPath] == YES
&& ([pathExt isEqual:@"eomodeld"] && ([pathExt isEqual:@"eomodeld"]
|| [pathExt isEqual:@"eomodel"])) || [pathExt isEqual:@"eomodel"]))
{ {
EOModel *model; EOModel *model;
NS_DURING NS_DURING
model = [[EOModel alloc] initWithContentsOfFile:modelPath]; model = [[EOModel alloc] initWithContentsOfFile:modelPath];
NS_HANDLER NS_HANDLER
return; return;
NS_ENDHANDLER NS_ENDHANDLER
[self _newDocumentWithModel:model]; [self _newDocumentWithModel:model];
RELEASE(model); RELEASE(model);
} }
} }
} }
} }