From e819de7f2889a25d3bc7c569b3fdee2f1551c61a Mon Sep 17 00:00:00 2001 From: Bibiko Date: Mon, 8 Mar 2010 19:40:17 +0000 Subject: =?UTF-8?q?=E2=80=A2=20Select=20Content=20Filter=20^=E2=8C=98F=20-?= =?UTF-8?q?=20select=20first=20textfield=20for=201=20or=202=20argument(s);?= =?UTF-8?q?=20if=20no=20argument=20field=20is=20selectable=20select=20comp?= =?UTF-8?q?areField=20-=20ensure=20the=20focus=20setting=20by=20calling=20?= =?UTF-8?q?"makeContentFilterHaveFocus"=20via=20performSelector:afterDelay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/TableContent.m | 19 +++++++++++++++++-- Source/TableDocument.m | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Source/TableContent.m b/Source/TableContent.m index bc040223..f41df80a 100644 --- a/Source/TableContent.m +++ b/Source/TableContent.m @@ -3219,7 +3219,7 @@ } // Duplicate row - if ([menuItem action] == @selector(copyRow:)) { + if ([menuItem action] == @selector(copyRow:)) { return ([tableContentView numberOfSelectedRows] == 1); } @@ -3231,7 +3231,22 @@ */ - (void)makeContentFilterHaveFocus { - [tableWindow makeFirstResponder:argumentField]; + + NSDictionary *filter = [[contentFilters objectForKey:compareType] objectAtIndex:[[compareField selectedItem] tag]]; + + if([filter objectForKey:@"NumberOfArguments"]) { + NSUInteger numOfArgs = [[filter objectForKey:@"NumberOfArguments"] integerValue]; + switch(numOfArgs) { + case 2: + [tableWindow makeFirstResponder:firstBetweenField]; + break; + case 1: + [tableWindow makeFirstResponder:argumentField]; + break; + default: + [tableWindow makeFirstResponder:compareField]; + } + } } #pragma mark - diff --git a/Source/TableDocument.m b/Source/TableDocument.m index 69fe4a0c..e72f0b86 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -2337,7 +2337,7 @@ { [self viewContent:self]; - [tableContentInstance makeContentFilterHaveFocus]; + [tableContentInstance performSelector:@selector(makeContentFilterHaveFocus) withObject:nil afterDelay:0.1]; } #pragma mark - -- cgit v1.2.3