From 7a5af6632f0c6797466372358327ddd75a4e7f22 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Fri, 3 Sep 2010 21:15:32 +0000 Subject: =?UTF-8?q?=E2=80=A2=20further=20improvements=20for=20CSV=20import?= =?UTF-8?q?=20into=20new=20table=20-=20fixed=20some=20RETURN/ENTER=20logic?= =?UTF-8?q?=20while=20editing=20a=20table=20cell=20-=20added=20context=20m?= =?UTF-8?q?enu=20to=20table=20for:=20--=20'Set=20all=20Field=20Types=20to:?= =?UTF-8?q?'=20which=20sets=20all=20types=20to=20the=20current=20selected?= =?UTF-8?q?=20one=20=E2=8C=98=3D=20--=20'Add=20Column=20to=20Table=20Targe?= =?UTF-8?q?t'=20(not=20yet=20implemented)=20-=20some=20minor=20code=20issu?= =?UTF-8?q?es=20-=20added=20Info=20button=20which=20will=20come=20up=20wit?= =?UTF-8?q?h=20a=20GUI=20for=20setting=20new=20table=20encoding=20and=20en?= =?UTF-8?q?gine=20(not=20yet=20implemented)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPTableView.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Source/SPTableView.m') diff --git a/Source/SPTableView.m b/Source/SPTableView.m index 7e212884..c3f76baf 100644 --- a/Source/SPTableView.m +++ b/Source/SPTableView.m @@ -92,8 +92,15 @@ if([self numberOfSelectedRows] == 1 && ([theEvent keyCode] == 36 || [theEvent keyCode] == 76)) { - // ENTER or RETURN closes the SPFieldMapperController sheet by sending an object with the tag 1 if([[[[self delegate] class] description] isEqualToString:@"SPFieldMapperController"]) { + + if([[self delegate] isGlobalValueSheetOpen]) { + [[self delegate] closeGlobalValuesSheet:nil]; + return; + } + + // ENTER or RETURN closes the SPFieldMapperController sheet + // by sending an object with the tag 1 if no table cell is edited if([[self delegate] canBeClosed]) { NSButton *b = [[[NSButton alloc] init] autorelease]; [b setTag:1]; @@ -117,6 +124,7 @@ [self editColumn:0 row:[self selectedRow] withEvent:nil select:YES]; return; } + } [super keyDown:theEvent]; -- cgit v1.2.3