From 1f3824ec2bc2465d9fe20c30f93db9ec5281151b Mon Sep 17 00:00:00 2001 From: mltownsend Date: Fri, 21 Nov 2008 01:12:59 +0000 Subject: Issue 34 Fix. Plus fixes for some warnings. --- English.lproj/DBView.xib | 17 ++++++++++++++++- TableContent.m | 3 +++ TableDump.m | 19 ++++++++++++++++--- TableSource.m | 8 ++++++++ TablesList.h | 4 ++-- TablesList.m | 27 ++++++++++++--------------- 6 files changed, 57 insertions(+), 21 deletions(-) diff --git a/English.lproj/DBView.xib b/English.lproj/DBView.xib index 829b680d..a2280417 100644 --- a/English.lproj/DBView.xib +++ b/English.lproj/DBView.xib @@ -8,6 +8,7 @@ 352.00 YES + YES @@ -35,7 +36,7 @@ {3.40282e+38, 3.40282e+38} {780, 480} - + 256 YES @@ -963,6 +964,7 @@ {{1, 1}, {194, 396}} + 4 @@ -989,6 +991,7 @@ {196, 398} + 530 @@ -1073,6 +1076,7 @@ {{1, 1}, {194, 123}} + 4 @@ -1099,6 +1103,7 @@ {{0, 407}, {196, 125}} + 530 @@ -1851,6 +1856,7 @@ {{1, 17}, {626, 282}} + 4 @@ -1883,6 +1889,7 @@ {{1, 0}, {626, 17}} + 4 @@ -1891,6 +1898,7 @@ {{-1, 24}, {628, 300}} + 562 @@ -2321,6 +2329,7 @@ {{1, 17}, {626, 138}} + 4 @@ -2353,6 +2362,7 @@ {{1, 0}, {626, 17}} + 4 @@ -2361,6 +2371,7 @@ {{-1, 22}, {628, 156}} + 562 @@ -3953,6 +3964,7 @@ {863, 550} + {{0, 0}, {1440, 878}} {780, 502} @@ -5923,6 +5935,7 @@ {{1, 17}, {423, 141}} + 6 @@ -5956,6 +5969,7 @@ {{1, 0}, {423, 17}} + 4 @@ -5964,6 +5978,7 @@ {{20, 45}, {425, 159}} + 530 diff --git a/TableContent.m b/TableContent.m index 0a98414c..6610ceb1 100644 --- a/TableContent.m +++ b/TableContent.m @@ -180,6 +180,7 @@ dataCell = [[[NSTextFieldCell alloc] initTextCell:@""] autorelease]; } [dataCell setEditable:YES]; + if ( [dataCell respondsToSelector:@selector(setLineBreakMode:)] ) { // Mac OS X 10.4+ [dataCell setLineBreakMode:NSLineBreakByTruncatingTail]; @@ -906,6 +907,8 @@ [editTextView setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]]; } else { [editTextView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + [limitRowsField setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + [argumentField setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; } [hexTextView setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]]; [limitRowsStepper setEnabled:NO]; diff --git a/TableDump.m b/TableDump.m index ea1a2914..185becec 100644 --- a/TableDump.m +++ b/TableDump.m @@ -44,7 +44,7 @@ get the tables in db //get tables [tables removeAllObjects]; - queryResult = [mySQLConnection listTables]; + queryResult = (CMMCPResult *)[mySQLConnection listTables]; for ( i = 0 ; i < [queryResult numOfRows] ; i++ ) { [queryResult dataSeek:i]; @@ -460,14 +460,14 @@ reads mysql-dumpfile //show fieldMapping sheet CMMCPResult *theResult; int i; - theResult = [mySQLConnection listTables]; + theResult = (CMMCPResult *) [mySQLConnection listTables]; for ( i = 0 ; i < [theResult numOfRows] ; i++ ) { [theResult dataSeek:i]; [fieldMappingPopup addItemWithTitle:[[theResult fetchRowAsArray] objectAtIndex:0]]; } if ([tableDocumentInstance table] != nil && ![(NSString *)[tableDocumentInstance table] isEqualToString:@""]) { - [fieldMappingPopup selectItemWithTitle:[tableDocumentInstance table]]; + [fieldMappingPopup selectItemWithTitle:[(TableDocument *)tableDocumentInstance table]]; } else { [fieldMappingPopup selectItemAtIndex:0]; } @@ -1475,6 +1475,19 @@ sets the connection (received from TableDocument) and makes things that have to } } +- (void)tableView:(NSTableView *)aTableView + willDisplayCell:(id)aCell + forTableColumn:(NSTableColumn *)aTableColumn + row:(int)rowIndex +{ + if ( [[NSUserDefaults standardUserDefaults] boolForKey:@"useMonospacedFonts"] ) { + [aCell setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]]; + } + else + { + [aCell setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + } +} - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex diff --git a/TableSource.m b/TableSource.m index 0d9e2bf4..caeb91fc 100644 --- a/TableSource.m +++ b/TableSource.m @@ -495,11 +495,19 @@ sets the connection (received from TableDocument) and makes things that have to if ( [prefs boolForKey:@"useMonospacedFonts"] ) { [[indexColumn dataCell] setFont:[NSFont fontWithName:@"Monaco" size:10]]; } + else + { + [[indexColumn dataCell] setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + } } while ( (fieldColumn = [fieldColumnsEnumerator nextObject]) ) { if ( [prefs boolForKey:@"useMonospacedFonts"] ) { [[fieldColumn dataCell] setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]]; } + else + { + [[fieldColumn dataCell] setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + } } } diff --git a/TablesList.h b/TablesList.h index 7693f94c..84bb5e4e 100644 --- a/TablesList.h +++ b/TablesList.h @@ -24,9 +24,9 @@ #import #import -#import "CMMCPConnection.h" -#import "CMMCPResult.h" +@class CMMCResult; +@class CMMCPConnection; @interface TablesList : NSObject { diff --git a/TablesList.m b/TablesList.m index 83a36a06..a5ab02e5 100644 --- a/TablesList.m +++ b/TablesList.m @@ -28,6 +28,8 @@ #import "TableContent.h" #import "TableDump.h" #import "ImageAndTextCell.h" +#import "CMMCPConnection.h" +#import "CMMCPResult.h" @implementation TablesList @@ -47,9 +49,10 @@ loads all table names in array tables and reload the tableView [tablesListView deselectAll:self]; [tables removeAllObjects]; - [tables addObject:@"TABLES"]; + [tables addObject:NSLocalizedString(@"TABLES",@"header for table list")]; - theResult = [mySQLConnection listTables]; + theResult = (CMMCPResult *)[mySQLConnection listTables]; + for ( i = 0 ; i < [theResult numOfRows] ; i++ ) { [theResult dataSeek:i]; [tables addObject:[[theResult fetchRowAsArray] objectAtIndex:0]]; @@ -275,19 +278,6 @@ sets the connection (received from TableDocument) and makes things that have to - (void)setConnection:(CMMCPConnection *)theConnection { mySQLConnection = theConnection; - - //prefs = [[NSUserDefaults standardUserDefaults] retain]; - - //set smallSystemFonts - //[[[tablesListView tableColumnWithIdentifier:@"tables"] dataCell] setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; - //[copyTableNameField setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; - //if ( [prefs boolForKey:@"useMonospacedFonts"] ) { - - if ( [[NSUserDefaults standardUserDefaults] boolForKey:@"useMonospacedFonts"] ) { - [[[tablesListView tableColumnWithIdentifier:@"tables"] dataCell] - setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]]; - } - [self updateTables:self]; } @@ -652,6 +642,13 @@ loads structure or source if tab selected the first time if (rowIndex > 0 && [[aTableColumn identifier] isEqualToString:@"tables"]) { [(ImageAndTextCell*)aCell setImage:[NSImage imageNamed:@"table-small"]]; [(ImageAndTextCell*)aCell setIndentationLevel:1]; + if ( [[NSUserDefaults standardUserDefaults] boolForKey:@"useMonospacedFonts"] ) { + [(ImageAndTextCell*)aCell setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]]; + } + else + { + [(ImageAndTextCell*)aCell setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + } } else { [(ImageAndTextCell*)aCell setImage:nil]; -- cgit v1.2.3