diff options
author | Bibiko <bibiko@eva.mpg.de> | 2010-10-29 20:06:44 +0000 |
---|---|---|
committer | Bibiko <bibiko@eva.mpg.de> | 2010-10-29 20:06:44 +0000 |
commit | e93d9df70e29e53c4588a6d49bf3a056ac56e9db (patch) | |
tree | 96b774aaac21f4a81d3a573b109520859f5a908a /Source/SPTableContent.m | |
parent | 79f4bb582755adfdc9504830d3a8bf061e1e49c1 (diff) | |
download | sequelpro-e93d9df70e29e53c4588a6d49bf3a056ac56e9db.tar.gz sequelpro-e93d9df70e29e53c4588a6d49bf3a056ac56e9db.tar.bz2 sequelpro-e93d9df70e29e53c4588a6d49bf3a056ac56e9db.zip |
• convert the Field Editor Sheet into a document-modal sheet, i.e. now the sheet doesn't block the entire app
- fixed various layout issues
- fixed some tiny memory leaks
• fixed tiny memory leak in MCPStreamingResult
Diffstat (limited to 'Source/SPTableContent.m')
-rw-r--r-- | Source/SPTableContent.m | 96 |
1 files changed, 56 insertions, 40 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index bab3cf0d..0ee639c8 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -2873,7 +2873,7 @@ * Show Error sheet (can be called from inside of a endSheet selector) * via [self performSelector:@selector(showErrorSheetWithTitle:) withObject: afterDelay:] */ --(void)showErrorSheetWith:(id)error +- (void)showErrorSheetWith:(id)error { // error := first object is the title , second the message, only one button OK SPBeginAlertSheet([error objectAtIndex:0], NSLocalizedString(@"OK", @"OK button"), @@ -2881,6 +2881,45 @@ [error objectAtIndex:1]); } +- (void)processFieldEditorResult:(id)data contextInfo:(NSDictionary*)contextInfo +{ + + if (data && contextInfo) { + NSUInteger row = [[contextInfo objectForKey:@"row"] integerValue]; + NSUInteger column = [[contextInfo objectForKey:@"column"] integerValue]; + BOOL isFieldEditable = ([contextInfo objectForKey:@"isFieldEditable"]) ? YES : NO; + if (!isEditingRow && [tablesListInstance tableType] != SPTableTypeView) { + [oldRow setArray:[tableValues rowContentsAtIndex:row]]; + isEditingRow = YES; + currentlyEditingRow = row; + } + + if ([data isKindOfClass:[NSString class]] + && [data isEqualToString:[prefs objectForKey:SPNullValue]] + && [[NSArrayObjectAtIndex(dataColumns, column) objectForKey:@"null"] boolValue]) + { + data = [[NSNull null] retain]; + } + if(isFieldEditable) { + if([tablesListInstance tableType] == SPTableTypeView) { + // since in a view we're editing a field rather than a row + isEditingRow = NO; + // update the field and refresh the table + [self tableView:tableContentView setObjectValue:[[data copy] autorelease] forTableColumn:[tableContentView tableColumnWithIdentifier:[contextInfo objectForKey:@"column"]] row:row]; + } else { + [tableValues replaceObjectInRow:row column:column withObject:[[data copy] autorelease]]; + } + } + } + + if(fieldEditor) { + [fieldEditor release]; + fieldEditor = nil; + } + + [[tableDocumentInstance parentWindow] makeFirstResponder:tableContentView]; +} + #pragma mark - #pragma mark Filter Table @@ -3899,7 +3938,8 @@ } } - SPFieldEditorController *fieldEditor = [[SPFieldEditorController alloc] init]; + if(fieldEditor) [fieldEditor release], fieldEditor = nil; + fieldEditor = [[SPFieldEditorController alloc] init]; [fieldEditor setTextMaxLength:fieldLength]; [fieldEditor setFieldType:(fieldType==nil) ? @"" : fieldType]; @@ -3910,44 +3950,18 @@ if ([cellValue isNSNull]) cellValue = [NSString stringWithString:[prefs objectForKey:SPNullValue]]; - id editData = [[fieldEditor editWithObject:cellValue - fieldName:[[aTableColumn headerCell] stringValue] - usingEncoding:[mySQLConnection stringEncoding] - isObjectBlob:isBlob - isEditable:isFieldEditable - withWindow:[tableDocumentInstance parentWindow]] retain]; - - if (editData) { - if (!isEditingRow && [tablesListInstance tableType] != SPTableTypeView) { - [oldRow setArray:[tableValues rowContentsAtIndex:rowIndex]]; - isEditingRow = YES; - currentlyEditingRow = rowIndex; - } - - if ([editData isKindOfClass:[NSString class]] - && [editData isEqualToString:[prefs objectForKey:SPNullValue]] - && [[NSArrayObjectAtIndex(dataColumns, [[aTableColumn identifier] integerValue]) objectForKey:@"null"] boolValue]) - { - [editData release]; - editData = [[NSNull null] retain]; - } - if(isFieldEditable) { - if([tablesListInstance tableType] == SPTableTypeView) { - // since in a view we're editing a field rather than a row - isEditingRow = NO; - // update the field and refresh the table - [self tableView:aTableView setObjectValue:[[editData copy] autorelease] forTableColumn:aTableColumn row:rowIndex]; - } else { - [tableValues replaceObjectInRow:rowIndex column:[[aTableColumn identifier] integerValue] withObject:[[editData copy] autorelease]]; - } - } - } - - [fieldEditor release]; - - if (editData) [editData release]; - - [[tableDocumentInstance parentWindow] makeFirstResponder:tableContentView]; + [fieldEditor editWithObject:cellValue + fieldName:[[aTableColumn headerCell] stringValue] + usingEncoding:[mySQLConnection stringEncoding] + isObjectBlob:isBlob + isEditable:isFieldEditable + withWindow:[tableDocumentInstance parentWindow] + sender:self + contextInfo:[NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInteger:rowIndex], @"row", + [aTableColumn identifier], @"column", + [NSNumber numberWithBool:isFieldEditable], @"isFieldEditable", + nil]]; return NO; } @@ -4466,6 +4480,8 @@ [NSObject cancelPreviousPerformRequestsWithTarget:self]; [NSObject cancelPreviousPerformRequestsWithTarget:tableContentView]; + if(fieldEditor) [fieldEditor release], fieldEditor = nil; + [self clearTableLoadTimer]; [tableValues release]; pthread_mutex_destroy(&tableValuesLock); |