diff options
90 files changed, 1095 insertions, 9514 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h index 60c9dcb6..dd8a172e 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h @@ -134,10 +134,8 @@ NSUInteger mConnectionFlags; /* The flags to be used for the connection to the database. */ id delegate; /* Connection delegate */ - - /* Anything that performs a mysql_net_read is not thread-safe: mysql queries, pings */ - /* Always lock the connection first. Don't use this lock directly, use the lockConnection method! */ - NSConditionLock *connectionLock; + + NSLock *queryLock; /* Anything that performs a mysql_net_read is not thread-safe: mysql queries, pings */ BOOL useKeepAlive; BOOL isDisconnecting; @@ -280,7 +278,6 @@ void performThreadedKeepAlive(void *ptr); // Locking - (void)lockConnection; -- (BOOL)tryLockConnection; - (void)unlockConnection; // Database structure @@ -288,8 +285,7 @@ void performThreadedKeepAlive(void *ptr); - (MCPResult *)listDBsLike:(NSString *)dbsName; - (MCPResult *)listTables; - (MCPResult *)listTablesLike:(NSString *)tablesName; -- (NSArray *)listTablesFromDB:(NSString *)dbName; -- (NSArray *)listTablesFromDB:(NSString *)dbName like:(NSString *)tablesName; +- (MCPResult *)listTablesFromDB:(NSString *)dbName like:(NSString *)tablesName; - (MCPResult *)listFieldsFromTable:(NSString *)tableName; - (MCPResult *)listFieldsFromTable:(NSString *)tableName like:(NSString *)fieldsName; diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m index a8eb923a..c24c8c8f 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m @@ -33,7 +33,6 @@ #import "MCPStreamingResult.h" #import "MCPConnectionProxy.h" #import "MCPStringAdditions.h" -#import "SPStringAdditions.h" #import "RegexKitLite.h" #include <unistd.h> @@ -91,12 +90,9 @@ static BOOL sTruncateLongFieldInLogs = YES; mEncoding = NSISOLatin1StringEncoding; mConnectionFlags = kMCPConnectionDefaultOption; - - // Anything that performs a mysql_net_read is not thread-safe: mysql queries, pings - // Always lock the connection first. Don't use this lock directly, use the lockConnection method! - connectionLock = [[NSConditionLock alloc] initWithCondition:MCPConnectionIdle]; - [connectionLock setName:@"MCPConnection connectionLock"]; - + + queryLock = [[NSLock alloc] init]; + connectionHost = nil; connectionLogin = nil; connectionSocket = nil; @@ -305,7 +301,7 @@ static BOOL sTruncateLongFieldInLogs = YES; currentProxyState = newState; [connectionProxy setConnectionStateChangeSelector:nil delegate:nil]; if (!isDisconnecting) [NSThread detachNewThreadSelector:@selector(reconnect) toTarget:self withObject:nil]; - + return; } @@ -390,22 +386,23 @@ static BOOL sTruncateLongFieldInLogs = YES; [self timeZone]; // Getting the timezone used by the server. // Only attempt to set the max allowed packet if we have a connection - if (mConnection != NULL) { - - isMaxAllowedPacketEditable = [self isMaxAllowedPacketEditable]; - - if (![self fetchMaxAllowedPacket]) { - [self setLastErrorMessage:nil]; - - lastQueryErrorId = mysql_errno(mConnection); - - mConnected = NO; - } - } - else { - mConnected = NO; - isMaxAllowedPacketEditable = NO; - } + if (mConnection != NULL) { + + isMaxAllowedPacketEditable = [self isMaxAllowedPacketEditable]; + + if (![self fetchMaxAllowedPacket]) { + [self setLastErrorMessage:nil]; + + lastQueryErrorId = mysql_errno(mConnection); + + mConnected = NO; + } + } + else { + mConnected = NO; + isMaxAllowedPacketEditable = NO; + } + return mConnected; } @@ -447,8 +444,7 @@ static BOOL sTruncateLongFieldInLogs = YES; * on the status, not returning control until either a connection has been established or * the connection and document have been closed. * Runs its own autorelease pool as sometimes called in a thread following proxy changes - * (where the return code doesn't matter). - */ + * (where the return code doesn't matter). */ - (BOOL)reconnect { NSAutoreleasePool *reconnectionPool = [[NSAutoreleasePool alloc] init]; @@ -477,7 +473,7 @@ static BOOL sTruncateLongFieldInLogs = YES; mConnected = NO; isDisconnecting = NO; - + // If there is a proxy, ensure it's disconnected and attempt to reconnect it in blocking fashion if (connectionProxy) { [connectionProxy setConnectionStateChangeSelector:nil delegate:nil]; @@ -518,7 +514,6 @@ static BOOL sTruncateLongFieldInLogs = YES; // overall time and extending the connection timeout by any interface time. interfaceInteractionTimer = [NSDate date]; [[NSRunLoop mainRunLoop] runMode:NSModalPanelRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.25]]; - //[[NSRunLoop currentRunLoop] runMode:NSModalPanelRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.25]]; if ([[NSDate date] timeIntervalSinceDate:interfaceInteractionTimer] < 0.25) { usleep(250000 - (1000000 * [[NSDate date] timeIntervalSinceDate:interfaceInteractionTimer])); } @@ -530,7 +525,7 @@ static BOOL sTruncateLongFieldInLogs = YES; currentProxyState = [connectionProxy state]; [connectionProxy setConnectionStateChangeSelector:@selector(connectionProxyStateChange:) delegate:self]; } - + if (!connectionProxy || [connectionProxy state] == PROXY_STATE_CONNECTED) { // Attempt to reinitialise the connection - if this fails, it will still be set to NULL. @@ -653,7 +648,7 @@ static BOOL sTruncateLongFieldInLogs = YES; - (BOOL)pingConnection { // Set up a query lock - [self lockConnection]; + [queryLock lock]; uint64_t currentTime_t; Nanoseconds elapsedTime; @@ -665,7 +660,7 @@ static BOOL sTruncateLongFieldInLogs = YES; pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - pthread_create(&pingThread, NULL, (void *)&pingConnectionTask, (void *)mConnection); + pthread_create(&pingThread, &attr, (void *)&pingConnectionTask, (void *)mConnection); // Loop tightly until the ping responds, or the elapsed time exceeds the connection timeout while (pingActive) { @@ -682,7 +677,7 @@ static BOOL sTruncateLongFieldInLogs = YES; } pthread_attr_destroy(&attr); - [self unlockConnection]; + [queryLock unlock]; return lastPingSuccess; } @@ -719,11 +714,10 @@ void pingConnectionTask(void *ptr) return; } - // Attempt to lock the connection. If the connection currently is busy, - // we don't need a ping. The connection is unlocked in threadedKeepAlive - // before the ping actually returns, to prevent the ping from delaying - // other queries - if (![self tryLockConnection]) return; + // Attempt to get a query lock, but release it to ensure the connection isn't locked + // by a background ping. + if (![queryLock tryLock]) return; + [queryLock unlock]; // Store the ping time lastKeepAliveTime = timeConnected; @@ -738,11 +732,7 @@ void pingConnectionTask(void *ptr) */ - (void)threadedKeepAlive { - if (!mConnected || keepAliveThread != NULL) { - // unlock the connection now. it has been locked in keepAlive: - [self unlockConnection]; - return; - } + if (!mConnected || keepAliveThread != NULL) return; // Use a ping timeout between zero and thirty seconds NSInteger pingTimeout = 30; @@ -754,9 +744,6 @@ void pingConnectionTask(void *ptr) pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); pthread_create(&keepAliveThread, &attr, (void *)&performThreadedKeepAlive, (void *)mConnection); - // unlock the connection now. it has been locked in keepAlive: - [self unlockConnection]; - // Give the connection time to respond, but force a timeout after the ping timeout // if the thread hasn't already closed itself. sleep(pingTimeout); @@ -1148,12 +1135,13 @@ void performThreadedKeepAlive(void *ptr) if (mConnected) { const char *theDBName = [self cStringFromString:dbName]; - [self lockConnection]; + [queryLock lock]; if (0 == mysql_select_db(mConnection, theDBName)) { - [self unlockConnection]; + [queryLock unlock]; + return YES; } - [self unlockConnection]; + [queryLock unlock]; } [self setLastErrorMessage:nil]; @@ -1462,7 +1450,10 @@ void performThreadedKeepAlive(void *ptr) } } - [self lockConnection]; + // Lock the connection - on this thread for normal result sets (avoiding blocking issues + // when the app is in modal mode), or ensuring a lock on the main thread for streaming queries. + if (streamResultType == MCPStreamingNone) [queryLock lock]; + else [self lockConnection]; // Run (or re-run) the query, timing the execution time of the query - note // that this time will include network lag. @@ -1481,7 +1472,7 @@ void performThreadedKeepAlive(void *ptr) // For normal result sets, fetch the results and unlock the connection if (streamResultType == MCPStreamingNone) { theResult = [[MCPResult alloc] initWithMySQLPtr:mConnection encoding:mEncoding timeZone:mTimeZone]; - if (!queryCancelled || !queryCancelUsedReconnect) [self unlockConnection]; + if (!queryCancelled || !queryCancelUsedReconnect) [queryLock unlock]; // For streaming result sets, fetch the result pointer and leave the connection locked } else if (streamResultType == MCPStreamingFast) { @@ -1497,7 +1488,8 @@ void performThreadedKeepAlive(void *ptr) break; } } else { - [self unlockConnection]; + if (streamResultType == MCPStreamingNone) [queryLock unlock]; + else [self unlockConnection]; } queryErrorMessage = [[NSString alloc] initWithString:@""]; @@ -1509,7 +1501,8 @@ void performThreadedKeepAlive(void *ptr) // On failure, set the error messages and IDs } else { if (!queryCancelled || !queryCancelUsedReconnect) { - [self unlockConnection]; + if (streamResultType == MCPStreamingNone) [queryLock unlock]; + else [self unlockConnection]; } if (queryCancelled) { @@ -1599,8 +1592,8 @@ void performThreadedKeepAlive(void *ptr) if (![self isConnected]) return; // Check whether a query is actually being performed - if not, also return. - if ([self tryLockConnection]) { - [self unlockConnection]; + if ([queryLock tryLock]) { + [queryLock unlock]; return; } @@ -1690,55 +1683,32 @@ void performThreadedKeepAlive(void *ptr) #pragma mark Connection locking /** - * Lock the connection. This must be done before performing any operation - * that is not thread safe, eg. performing queries or pinging. + * Lock the connection from any thread; ensure the the connection is locked on + * the main thread, but as fast as possible. */ - (void)lockConnection { - // We can only start a query as soon as the condition is MCPConnectionIdle - [connectionLock lockWhenCondition:MCPConnectionIdle]; - - // We now set the condition to MCPConnectionBusy - [connectionLock unlockWithCondition:MCPConnectionBusy]; + if ([NSThread isMainThread]) [queryLock lock]; + else [queryLock performSelectorOnMainThread:@selector(lock) withObject:nil waitUntilDone:YES]; } /** - * Try locking the connection. If the connection is idle (unlocked), this method - * locks the connection and returns YES. The connection must afterwards be unlocked - * using unlockConnection. If the connection is currently busy (locked), this - * method immediately returns NO and doesn't lock the connection. + * Unlock the connection from any thread; ensure the connection is unlocked on + * the main thread, but as fast as possible. */ -- (BOOL)tryLockConnection +- (void)unlockConnection { - // check if the condition is MCPConnectionIdle - if ([connectionLock tryLockWhenCondition:MCPConnectionIdle]) { - // We're allowed to use the connection! - [connectionLock unlockWithCondition:MCPConnectionBusy]; - return YES; - } else { - // Someone else is using the connection right now - return NO; - } -} + // Ensure the unlock occurs on the main thread + if (![NSThread isMainThread]) { + [self performSelectorOnMainThread:@selector(unlockConnection) withObject:nil waitUntilDone:NO]; + return; + } -/** - * Unlock the connection. - */ -- (void)unlockConnection -{ - // We don't care if the connection is busy or not - [connectionLock lock]; - - // We check if the connection actually was busy. If it wasn't busy, - // it means we probably tried to unlock the connection twice. This is - // potentially dangerous, therefore we log this to the console - if ([connectionLock condition]!=MCPConnectionBusy) { - NSLog(@"Tried to unlock the connection, but it wasn't locked."); - } - - // We tell everyone that the connection is available again! - [connectionLock unlockWithCondition:MCPConnectionIdle]; + // Unlock the connection, first ensuring it is locked to avoid + // multiple unlock call issues (eg reconnected queries, threading) + [queryLock tryLock]; + [queryLock unlock]; } #pragma mark - @@ -1767,7 +1737,7 @@ void performThreadedKeepAlive(void *ptr) if (![self checkConnection]) return [[[MCPResult alloc] init] autorelease]; - [self lockConnection]; + [queryLock lock]; if ((dbsName == nil) || ([dbsName isEqualToString:@""])) { if (theResPtr = mysql_list_dbs(mConnection, NULL)) { theResult = [[MCPResult alloc] initWithResPtr: theResPtr encoding: mEncoding timeZone:mTimeZone]; @@ -1786,7 +1756,7 @@ void performThreadedKeepAlive(void *ptr) theResult = [[MCPResult alloc] init]; } } - [self unlockConnection]; + [queryLock unlock]; if (theResult) { [theResult autorelease]; @@ -1820,7 +1790,7 @@ void performThreadedKeepAlive(void *ptr) if (![self checkConnection]) return [[[MCPResult alloc] init] autorelease]; - [self lockConnection]; + [queryLock lock]; if ((tablesName == nil) || ([tablesName isEqualToString:@""])) { if (theResPtr = mysql_list_tables(mConnection, NULL)) { theResult = [[MCPResult alloc] initWithResPtr: theResPtr encoding: mEncoding timeZone:mTimeZone]; @@ -1839,7 +1809,7 @@ void performThreadedKeepAlive(void *ptr) } } - [self unlockConnection]; + [queryLock unlock]; if (theResult) { [theResult autorelease]; @@ -1848,41 +1818,26 @@ void performThreadedKeepAlive(void *ptr) return theResult; } -- (NSArray *)listTablesFromDB:(NSString *)dbName { - return [self listTablesFromDB:dbName like:nil]; -} - /** * List tables in DB specified by dbName and corresponding to pattern. * This method indeed issues a !{SHOW TABLES FROM dbName LIKE ...} query to the server. * This is done this way to make sure the selected DB is not changed by this method. */ -- (NSArray *)listTablesFromDB:(NSString *)dbName like:(NSString *)tablesName { +- (MCPResult *)listTablesFromDB:(NSString *)dbName like:(NSString *)tablesName +{ MCPResult *theResult; + if ((tablesName == nil) || ([tablesName isEqualToString:@""])) { - NSString *theQuery = [NSString stringWithFormat:@"SHOW TABLES FROM %@", - [dbName backtickQuotedString]]; + NSString *theQuery = [NSString stringWithFormat:@"SHOW TABLES FROM %@", dbName]; theResult = [self queryString:theQuery]; - } else { - NSString *theQuery = [NSString stringWithFormat:@"SHOW TABLES FROM %@ LIKE '%@'", - [dbName backtickQuotedString], - [tablesName backtickQuotedString]]; + } + else { + NSString *theQuery = [NSString stringWithFormat:@"SHOW TABLES FROM %@ LIKE '%@'", dbName, tablesName]; theResult = [self queryString:theQuery]; } [theResult setReturnDataAsStrings:YES]; - NSString *theTableName; - NSMutableArray *theDBTables = [NSMutableArray array]; - - // NSLog(@"num of fields: %@; num of rows: %@", [theResult numOfFields], [theResult numOfRows]); - if ([theResult numOfRows] > 0) { - int i; - for ( i = 0 ; i < [theResult numOfRows] ; i++ ) { - theTableName = [[theResult fetchRowAsArray] objectAtIndex:0]; - [theDBTables addObject:theTableName]; - } - } - - return theDBTables; + + return theResult; } /** @@ -1903,14 +1858,11 @@ void performThreadedKeepAlive(void *ptr) MCPResult *theResult; if ((fieldsName == nil) || ([fieldsName isEqualToString:@""])) { - NSString *theQuery = [NSString stringWithFormat:@"SHOW COLUMNS FROM %@", - [tableName backtickQuotedString]]; + NSString *theQuery = [NSString stringWithFormat:@"SHOW COLUMNS FROM %@", tableName]; theResult = [self queryString:theQuery]; } else { - NSString *theQuery = [NSString stringWithFormat:@"SHOW COLUMNS FROM %@ LIKE '%@'", - [tableName backtickQuotedString], - [fieldsName backtickQuotedString]]; + NSString *theQuery = [NSString stringWithFormat:@"SHOW COLUMNS FROM %@ LIKE '%@'", tableName, fieldsName]; theResult = [self queryString:theQuery]; } [theResult setReturnDataAsStrings:YES]; @@ -2057,10 +2009,10 @@ void performThreadedKeepAlive(void *ptr) // Do not parse more than 2000 tables/views per db if(numberOfTables > 2000) { - NSLog(@"%ld items in database %@. Only 2000 items can be parsed. Stopped parsing.", numberOfTables, currentDatabase); - [queryPool release]; - return; - } + NSLog(@"%ld items in database %@. Only 2000 items can be parsed. Stopped parsing.", numberOfTables, currentDatabase); + [queryPool release]; + return; + } // For future usage NSString *affectedItem = nil; @@ -2120,26 +2072,28 @@ void performThreadedKeepAlive(void *ptr) if (connectionSetupStatus) { MYSQL_RES *theResult; MYSQL_ROW row; + NSString *charset; + NSUInteger uniqueCounter = 0; // used to make field data unique // Get the doc encoding due to pref settings etc. - NSString *docEncoding = [[self delegate] connectionEncoding]; - NSStringEncoding theConnectionEncoding = [MCPConnection encodingForMySQLEncoding:[self cStringFromString:docEncoding]]; + NSString *docEncoding = [[self delegate] connectionEncoding]; + NSStringEncoding theConnectionEncoding = [MCPConnection encodingForMySQLEncoding:[self cStringFromString:docEncoding]]; - // Try to set connection encoding - NSString *query = [NSString stringWithFormat:@"SET NAMES '%@'", docEncoding]; + // Try to set connection encoding + NSString *query = [NSString stringWithFormat:@"SET NAMES '%@'", docEncoding]; NSData *encodedQueryData = NSStringDataUsingLossyEncoding(query, theConnectionEncoding, 1); const char *queryCString = [encodedQueryData bytes]; unsigned long queryCStringLength = [encodedQueryData length]; if (mysql_real_query(structConnection, queryCString, queryCStringLength) != 0) { NSLog(@"Error while querying the database structure. Could not set encoding to %@", docEncoding); - [queryPool release]; - return; - } + [queryPool release]; + return; + } - // Increase global query-db-counter - [self performSelectorOnMainThread:@selector(incrementQueryingDbStructure) withObject:nil waitUntilDone:YES]; + // Increase global query-db-counter + [self performSelectorOnMainThread:@selector(incrementQueryingDbStructure) withObject:nil waitUntilDone:YES]; [queriedStructureKeys addObject:db_id]; @@ -2259,47 +2213,47 @@ void performThreadedKeepAlive(void *ptr) queryCStringLength = [encodedQueryData length]; if (mysql_real_query(structConnection, queryCString, queryCStringLength) == 0) { // Query for procedures and functions - query = [NSString stringWithFormat:@"SELECT * FROM `information_schema`.`ROUTINES` WHERE `information_schema`.`ROUTINES`.`ROUTINE_SCHEMA` = '%@'", [currentDatabase stringByReplacingOccurrencesOfString:@"'" withString:@"\'"]]; - encodedQueryData = NSStringDataUsingLossyEncoding(query, theConnectionEncoding, 1); - queryCString = [encodedQueryData bytes]; - queryCStringLength = [encodedQueryData length]; - if (mysql_real_query(structConnection, queryCString, queryCStringLength) == 0) { - theResult = mysql_use_result(structConnection); - NSUInteger numberOfFields = mysql_num_fields(theResult); - while(row = mysql_fetch_row(theResult)) { + query = [NSString stringWithFormat:@"SELECT * FROM `information_schema`.`ROUTINES` WHERE `information_schema`.`ROUTINES`.`ROUTINE_SCHEMA` = '%@'", [currentDatabase stringByReplacingOccurrencesOfString:@"'" withString:@"\'"]]; + encodedQueryData = NSStringDataUsingLossyEncoding(query, theConnectionEncoding, 1); + queryCString = [encodedQueryData bytes]; + queryCStringLength = [encodedQueryData length]; + if (mysql_real_query(structConnection, queryCString, queryCStringLength) == 0) { + theResult = mysql_use_result(structConnection); + NSUInteger numberOfFields = mysql_num_fields(theResult); + while(row = mysql_fetch_row(theResult)) { if(cancelQueryingDbStructure) { [self performSelectorOnMainThread:@selector(decrementQueryingDbStructure) withObject:nil waitUntilDone:YES]; [queryPool release]; return; } - NSString *field = [self stringWithUTF8CString:row[0]]; - NSString *table_id = [NSString stringWithFormat:@"%@%@%@", db_id, SPUniqueSchemaDelimiter, field]; - NSString *field_id = [NSString stringWithFormat:@"%@%@%@", table_id, SPUniqueSchemaDelimiter, field]; - NSString *type = ([[self stringWithUTF8CString:row[4]] isEqualToString:@"FUNCTION"]) ? @"3" : @"2"; - NSString *dtd = [self stringWithUTF8CString:row[5]]; - NSString *det = [self stringWithUTF8CString:row[11]]; - NSString *access = [self stringWithUTF8CString:row[12]]; - NSString *security_type = [self stringWithUTF8CString:row[14]]; - NSString *definer = [self stringWithUTF8CString:row[19]]; - - [queriedStructureKeys addObject:table_id]; - [queriedStructureKeys addObject:field_id]; - - if(![queriedStructure valueForKey:db_id] || [[queriedStructure valueForKey:db_id] isKindOfClass:[NSString class]] ) - [queriedStructure setObject:[NSMutableDictionary dictionary] forKey:db_id]; - - if(![[queriedStructure valueForKey:db_id] valueForKey:table_id]) - [[queriedStructure valueForKey:db_id] setObject:[NSMutableDictionary dictionary] forKey:table_id]; - - [[[queriedStructure valueForKey:db_id] valueForKey:table_id] setObject: - [NSArray arrayWithObjects:dtd, access, det, security_type, definer, [NSNumber numberWithUnsignedLongLong:uniqueCounter], nil] forKey:field_id]; - [[[queriedStructure valueForKey:db_id] valueForKey:table_id] setObject:type forKey:@" struct_type "]; - uniqueCounter++; - } - mysql_free_result(theResult); - } else { - NSLog(@"Error while querying the database structure for procedures and functions. Could not set encoding to utf8"); - } + NSString *field = [self stringWithUTF8CString:row[0]]; + NSString *table_id = [NSString stringWithFormat:@"%@%@%@", db_id, SPUniqueSchemaDelimiter, field]; + NSString *field_id = [NSString stringWithFormat:@"%@%@%@", table_id, SPUniqueSchemaDelimiter, field]; + NSString *type = ([[self stringWithUTF8CString:row[4]] isEqualToString:@"FUNCTION"]) ? @"3" : @"2"; + NSString *dtd = [self stringWithUTF8CString:row[5]]; + NSString *det = [self stringWithUTF8CString:row[11]]; + NSString *access = [self stringWithUTF8CString:row[12]]; + NSString *security_type = [self stringWithUTF8CString:row[14]]; + NSString *definer = [self stringWithUTF8CString:row[19]]; + + [queriedStructureKeys addObject:table_id]; + [queriedStructureKeys addObject:field_id]; + + if(![queriedStructure valueForKey:db_id] || [[queriedStructure valueForKey:db_id] isKindOfClass:[NSString class]] ) + [queriedStructure setObject:[NSMutableDictionary dictionary] forKey:db_id]; + + if(![[queriedStructure valueForKey:db_id] valueForKey:table_id]) + [[queriedStructure valueForKey:db_id] setObject:[NSMutableDictionary dictionary] forKey:table_id]; + + [[[queriedStructure valueForKey:db_id] valueForKey:table_id] setObject: + [NSArray arrayWithObjects:dtd, access, det, security_type, definer, [NSNumber numberWithUnsignedLongLong:uniqueCounter], nil] forKey:field_id]; + [[[queriedStructure valueForKey:db_id] valueForKey:table_id] setObject:type forKey:@" struct_type "]; + uniqueCounter++; + } + mysql_free_result(theResult); + } else { + NSLog(@"Error while querying the database structure for procedures and functions. Could not set encoding to utf8"); + } } } @@ -2426,25 +2380,23 @@ void performThreadedKeepAlive(void *ptr) */ - (MCPResult *)listProcesses { - MCPResult *result = nil; + MCPResult *theResult = nil; MYSQL_RES *theResPtr; - [self lockConnection]; - - if (mConnected && (mConnection != NULL)) { - if (theResPtr = mysql_list_processes(mConnection)) { - result = [[MCPResult alloc] initWithResPtr:theResPtr encoding:mEncoding timeZone:mTimeZone]; - } - else { - result = [[MCPResult alloc] init]; - } + [queryLock lock]; + if (theResPtr = mysql_list_processes(mConnection)) { + theResult = [[MCPResult alloc] initWithResPtr:theResPtr encoding:mEncoding timeZone:mTimeZone]; } + else { + theResult = [[MCPResult alloc] init]; + } + [queryLock unlock]; - [self unlockConnection]; - - if (result) [result autorelease]; + if (theResult) { + [theResult autorelease]; + } - return result; + return theResult; } /** @@ -2603,7 +2555,7 @@ void performThreadedKeepAlive(void *ptr) if ([self serverMajorVersion] == 3) queryString = "SHOW VARIABLES LIKE 'max_allowed_packet'"; else queryString = "SELECT @@global.max_allowed_packet"; - [self lockConnection]; + [queryLock lock]; if (0 == mysql_query(mConnection, queryString)) { if (mysql_field_count(mConnection) != 0) { MCPResult *r = [[MCPResult alloc] initWithMySQLPtr:mConnection encoding:mEncoding timeZone:mTimeZone]; @@ -2611,13 +2563,13 @@ void performThreadedKeepAlive(void *ptr) NSArray *a = [r fetchRowAsArray]; [r autorelease]; if([a count]) { - [self unlockConnection]; + [queryLock unlock]; maxAllowedPacketSize = [[a objectAtIndex:([self serverMajorVersion] == 3)?1:0] integerValue]; return true; } } } - [self unlockConnection]; + [queryLock unlock]; return false; } @@ -2652,9 +2604,9 @@ void performThreadedKeepAlive(void *ptr) { if(![self isMaxAllowedPacketEditable] || newSize < 1024) return maxAllowedPacketSize; - [self lockConnection]; + [queryLock lock]; mysql_query(mConnection, [[NSString stringWithFormat:@"SET GLOBAL max_allowed_packet = %ld", newSize] UTF8String]); - [self unlockConnection]; + [queryLock unlock]; // Inform the user via a log entry about that change according to reset value if(delegate && [delegate respondsToSelector:@selector(queryGaveError:connection:)]) @@ -2673,9 +2625,9 @@ void performThreadedKeepAlive(void *ptr) { BOOL isEditable; - [self lockConnection]; + [queryLock lock]; isEditable = !mysql_query(mConnection, "SET GLOBAL max_allowed_packet = @@global.max_allowed_packet"); - [self unlockConnection]; + [queryLock unlock]; return isEditable; } @@ -2734,10 +2686,10 @@ void performThreadedKeepAlive(void *ptr) theString = [[NSString alloc] initWithData:theData encoding:mEncoding]; if (theString) { - [theString autorelease]; - } - - return theString; + [theString autorelease]; + } + + return theString; } /** @@ -2745,14 +2697,14 @@ void performThreadedKeepAlive(void *ptr) */ - (NSString *)stringWithCString:(const char *)theCString usingEncoding:(NSStringEncoding)encoding { - NSData *theData; - NSString *theString; - - if (theCString == NULL) return @""; - - theData = [NSData dataWithBytes:theCString length:(strlen(theCString))]; - theString = [[NSString alloc] initWithData:theData encoding:encoding]; - + NSData *theData; + NSString *theString; + + if (theCString == NULL) return @""; + + theData = [NSData dataWithBytes:theCString length:(strlen(theCString))]; + theString = [[NSString alloc] initWithData:theData encoding:encoding]; + if (theString) { [theString autorelease]; } @@ -2809,7 +2761,7 @@ void performThreadedKeepAlive(void *ptr) // Ensure the query lock is unlocked, thereafter setting to nil in case of pending calls [self unlockConnection]; - [connectionLock release], connectionLock = nil; + [queryLock release], queryLock = nil; // Clean up connections if necessary if (mConnected) [self disconnect]; diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConstants.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConstants.h index fba7d651..acdeee16 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConstants.h +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConstants.h @@ -52,13 +52,6 @@ enum }; typedef NSUInteger MCPQueryStreamingType; -// Connection state -// This is used internally by MCPConnection to prevent simultaneous execution of different queries -enum { - MCPConnectionIdle = 0, - MCPConnectionBusy = 1 -}; - // Charcater set mapping constants typedef struct _OUR_CHARSET { diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.h b/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.h index e8230fff..b17f8584 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.h +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.h @@ -71,4 +71,4 @@ typedef struct SP_MYSQL_ROWS { - (NSArray *)fetchNextRowAsArray; - (void) cancelResultLoad; -@end +@end
\ No newline at end of file diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m b/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m index 3b39738b..f6371b03 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m @@ -85,9 +85,7 @@ [mNames release]; mNames = nil; } - - - + mResult = mysql_use_result(mySQLPtr); if (mResult) { @@ -100,7 +98,7 @@ // Obtain SEL references and pointer isConnectedSEL = @selector(isConnected); isConnectedPtr = [parentConnection methodForSelector:isConnectedSEL]; - + // If the result is opened in download-data-fast safe mode, set up the additional variables // and threads required. if (!fullyStreaming) { @@ -133,14 +131,9 @@ */ - (void) dealloc { - [self cancelResultLoad]; //this should close the connection if it is still open - - if (!connectionUnlocked) { - //this should NEVER happen - NSLog(@"MCPStreamingResult: The connection has not been unlocked."); - [parentConnection unlockConnection]; - } - + [self cancelResultLoad]; + if (!connectionUnlocked) [parentConnection unlockConnection]; + if (!fullyStreaming) { pthread_mutex_destroy(&dataFreeLock); pthread_mutex_destroy(&dataCreationLock); @@ -169,14 +162,8 @@ if (fullyStreaming) { theRow = mysql_fetch_row(mResult); - // If no data was returned, we're at the end of the result set - unlock the connection and return nil - if (theRow == NULL) { - if (!connectionUnlocked) { - [parentConnection unlockConnection]; - connectionUnlocked = YES; - } - return nil; - } + // If no data was returned, we're at the end of the result set - return nil. + if (theRow == NULL) return nil; // Retrieve the lengths of the returned data fieldLengths = mysql_fetch_lengths(mResult); @@ -346,7 +333,6 @@ /* * Ensure the result set is fully processed and freed without any processing - * This method ensures that the connection is unlocked. */ - (void) cancelResultLoad { @@ -359,13 +345,7 @@ theRow = mysql_fetch_row(mResult); // If no data was returned, we're at the end of the result set - return. - if (theRow == NULL) { - if (!connectionUnlocked) { - [parentConnection unlockConnection]; - connectionUnlocked = YES; - } - return; - } + if (theRow == NULL) return; } // If in cached-streaming/fast download mode, loop until all data is fetched and freed @@ -381,8 +361,8 @@ // once all memory has been freed if (processedRowCount == downloadedRowCount) { while (!dataFreed) usleep(1000); - // we don't need to unlock the connection because - // the data loading thread already did that + [parentConnection unlockConnection]; + connectionUnlocked = YES; return; } processedRowCount++; @@ -479,8 +459,8 @@ } // Unlock the parent connection now data has been retrieved - [parentConnection unlockConnection]; - connectionUnlocked = YES; + connectionUnlocked = YES; + [parentConnection unlockConnection]; dataDownloaded = YES; [downloadPool drain]; @@ -528,4 +508,4 @@ [dataFreeingPool drain]; } -@end +@end
\ No newline at end of file diff --git a/Frameworks/MCPKit/MySQL/include/mysql_version.h b/Frameworks/MCPKit/MySQL/include/mysql_version.h index 7017707c..4cb3f2c2 100644 --- a/Frameworks/MCPKit/MySQL/include/mysql_version.h +++ b/Frameworks/MCPKit/MySQL/include/mysql_version.h @@ -9,11 +9,11 @@ #include <custom_conf.h> #else #define PROTOCOL_VERSION 10 -#define MYSQL_SERVER_VERSION "5.1.46" +#define MYSQL_SERVER_VERSION "5.1.44" #define MYSQL_BASE_VERSION "mysqld-5.1" #define MYSQL_SERVER_SUFFIX_DEF "" #define FRM_VER 6 -#define MYSQL_VERSION_ID 50146 +#define MYSQL_VERSION_ID 50144 #define MYSQL_PORT 3306 #define MYSQL_PORT_DEFAULT 0 #define MYSQL_UNIX_ADDR "/tmp/mysql.sock" diff --git a/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a b/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a Binary files differindex 512d3b52..c4a5bdca 100644 --- a/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a +++ b/Frameworks/MCPKit/MySQL/lib/libmysqlclient.a diff --git a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a Binary files differindex a9ae37fe..58d05c93 100644 --- a/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a +++ b/Frameworks/MCPKit/MySQL/lib/libmysqlclient_r.a diff --git a/Frameworks/OCMock.framework/Headers b/Frameworks/OCMock.framework/Headers deleted file mode 120000 index a177d2a6..00000000 --- a/Frameworks/OCMock.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers
\ No newline at end of file diff --git a/Frameworks/OCMock.framework/OCMock b/Frameworks/OCMock.framework/OCMock deleted file mode 120000 index c388ea8d..00000000 --- a/Frameworks/OCMock.framework/OCMock +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/OCMock
\ No newline at end of file diff --git a/Frameworks/OCMock.framework/Resources b/Frameworks/OCMock.framework/Resources deleted file mode 120000 index 953ee36f..00000000 --- a/Frameworks/OCMock.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources
\ No newline at end of file diff --git a/Frameworks/OCMock.framework/Versions/A/Headers/NSNotificationCenter+OCMAdditions.h b/Frameworks/OCMock.framework/Versions/A/Headers/NSNotificationCenter+OCMAdditions.h deleted file mode 100644 index ae2e37d0..00000000 --- a/Frameworks/OCMock.framework/Versions/A/Headers/NSNotificationCenter+OCMAdditions.h +++ /dev/null @@ -1,15 +0,0 @@ -//--------------------------------------------------------------------------------------- -// $Id: NSNotificationCenter+OCMAdditions.h$ -// Copyright (c) 2009 by Mulle Kybernetik. See License file for details. -//--------------------------------------------------------------------------------------- - -#import <Foundation/Foundation.h> - -@class OCMockObserver; - - -@interface NSNotificationCenter(OCMAdditions) - -- (void)addMockObserver:(OCMockObserver *)notificationObserver name:(NSString *)notificationName object:(id)notificationSender; - -@end diff --git a/Frameworks/OCMock.framework/Versions/A/Headers/OCMArg.h b/Frameworks/OCMock.framework/Versions/A/Headers/OCMArg.h deleted file mode 100644 index a775f39f..00000000 --- a/Frameworks/OCMock.framework/Versions/A/Headers/OCMArg.h +++ /dev/null @@ -1,30 +0,0 @@ -//--------------------------------------------------------------------------------------- -// $Id$ -// Copyright (c) 2009 by Mulle Kybernetik. See License file for details. -//--------------------------------------------------------------------------------------- - -#import <Foundation/Foundation.h> - -@interface OCMArg : NSObject - -// constraining arguments - -+ (id)any; -+ (void *)anyPointer; -+ (id)isNil; -+ (id)isNotNil; -+ (id)isNotEqual:(id)value; -+ (id)checkWithSelector:(SEL)selector onObject:(id)anObject; - -// manipulating arguments - -+ (id *)setTo:(id)value; - -// internal use only - -+ (id)resolveSpecialValues:(NSValue *)value; - -@end - -#define OCMOCK_ANY [OCMArg any] -#define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(typeof(variable))] diff --git a/Frameworks/OCMock.framework/Versions/A/Headers/OCMConstraint.h b/Frameworks/OCMock.framework/Versions/A/Headers/OCMConstraint.h deleted file mode 100644 index 0bab7775..00000000 --- a/Frameworks/OCMock.framework/Versions/A/Headers/OCMConstraint.h +++ /dev/null @@ -1,48 +0,0 @@ -//--------------------------------------------------------------------------------------- -// $Id$ -// Copyright (c) 2007-2009 by Mulle Kybernetik. See License file for details. -//--------------------------------------------------------------------------------------- - -#import <Foundation/Foundation.h> - -@interface OCMConstraint : NSObject - -+ (id)constraint; -- (BOOL)evaluate:(id)value; - -// if you are looking for any, isNil, etc, they have moved to OCMArg - -+ (id)constraintWithSelector:(SEL)aSelector onObject:(id)anObject; -+ (id)constraintWithSelector:(SEL)aSelector onObject:(id)anObject withValue:(id)aValue; - -// try to use [OCMArg checkWith...] instead of constraintWithSelector in here - -@end - -@interface OCMAnyConstraint : OCMConstraint -@end - -@interface OCMIsNilConstraint : OCMConstraint -@end - -@interface OCMIsNotNilConstraint : OCMConstraint -@end - -@interface OCMIsNotEqualConstraint : OCMConstraint -{ - @public - id testValue; -} - -@end - -@interface OCMInvocationConstraint : OCMConstraint -{ - @public - NSInvocation *invocation; -} - -@end - -#define CONSTRAINT(aSelector) [OCMConstraint constraintWithSelector:aSelector onObject:self] -#define CONSTRAINTV(aSelector, aValue) [OCMConstraint constraintWithSelector:aSelector onObject:self withValue:(aValue)] diff --git a/Frameworks/OCMock.framework/Versions/A/Headers/OCMock.h b/Frameworks/OCMock.framework/Versions/A/Headers/OCMock.h deleted file mode 100644 index e18de58a..00000000 --- a/Frameworks/OCMock.framework/Versions/A/Headers/OCMock.h +++ /dev/null @@ -1,10 +0,0 @@ -//--------------------------------------------------------------------------------------- -// $Id$ -// Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details. -//--------------------------------------------------------------------------------------- - -#import <OCMock/OCMockObject.h> -#import <OCMock/OCMockRecorder.h> -#import <OCMock/OCMConstraint.h> -#import <OCMock/OCMArg.h> -#import <OCMock/NSNotificationCenter+OCMAdditions.h> diff --git a/Frameworks/OCMock.framework/Versions/A/Headers/OCMockObject.h b/Frameworks/OCMock.framework/Versions/A/Headers/OCMockObject.h deleted file mode 100644 index 87e7b82e..00000000 --- a/Frameworks/OCMock.framework/Versions/A/Headers/OCMockObject.h +++ /dev/null @@ -1,41 +0,0 @@ -//--------------------------------------------------------------------------------------- -// $Id$ -// Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details. -//--------------------------------------------------------------------------------------- - -#import <Foundation/Foundation.h> - -@interface OCMockObject : NSProxy -{ - BOOL isNice; - BOOL expectationOrderMatters; - NSMutableArray *recorders; - NSMutableArray *expectations; - NSMutableArray *exceptions; -} - -+ (id)mockForClass:(Class)aClass; -+ (id)mockForProtocol:(Protocol *)aProtocol; -+ (id)partialMockForObject:(NSObject *)anObject; - -+ (id)niceMockForClass:(Class)aClass; -+ (id)niceMockForProtocol:(Protocol *)aProtocol; - -+ (id)observerMock; - -- (id)init; - -- (void)setExpectationOrderMatters:(BOOL)flag; - -- (id)stub; -- (id)expect; - -- (void)verify; - -// internal use only - -- (id)getNewRecorder; -- (BOOL)handleInvocation:(NSInvocation *)anInvocation; -- (void)handleUnRecordedInvocation:(NSInvocation *)anInvocation; - -@end diff --git a/Frameworks/OCMock.framework/Versions/A/Headers/OCMockRecorder.h b/Frameworks/OCMock.framework/Versions/A/Headers/OCMockRecorder.h deleted file mode 100644 index 7463a3f4..00000000 --- a/Frameworks/OCMock.framework/Versions/A/Headers/OCMockRecorder.h +++ /dev/null @@ -1,28 +0,0 @@ -//--------------------------------------------------------------------------------------- -// $Id$ -// Copyright (c) 2004-2009 by Mulle Kybernetik. See License file for details. -//--------------------------------------------------------------------------------------- - -#import <Foundation/Foundation.h> - -@interface OCMockRecorder : NSProxy -{ - id signatureResolver; - NSInvocation *recordedInvocation; - NSMutableArray *invocationHandlers; -} - -- (id)initWithSignatureResolver:(id)anObject; - -- (BOOL)matchesInvocation:(NSInvocation *)anInvocation; -- (void)releaseInvocation; - -- (id)andReturn:(id)anObject; -- (id)andReturnValue:(NSValue *)aValue; -- (id)andThrow:(NSException *)anException; -- (id)andPost:(NSNotification *)aNotification; -- (id)andCall:(SEL)selector onObject:(id)anObject; - -- (NSArray *)invocationHandlers; - -@end diff --git a/Frameworks/OCMock.framework/Versions/A/OCMock b/Frameworks/OCMock.framework/Versions/A/OCMock Binary files differdeleted file mode 100755 index 303e9337..00000000 --- a/Frameworks/OCMock.framework/Versions/A/OCMock +++ /dev/null diff --git a/Frameworks/OCMock.framework/Versions/A/Resources/Info.plist b/Frameworks/OCMock.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index 4634d14c..00000000 --- a/Frameworks/OCMock.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>OCMock</string> - <key>CFBundleIdentifier</key> - <string>com.mulle-kybernetik.OCMock</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>OCMock</string> - <key>CFBundlePackageType</key> - <string>FMWK</string> - <key>CFBundleShortVersionString</key> - <string>1.29</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1</string> - <key>NSHumanReadableCopyright</key> - <string>Copyright © 2004-2009 Mulle Kybernetik.</string> -</dict> -</plist> diff --git a/Frameworks/OCMock.framework/Versions/A/Resources/License.txt b/Frameworks/OCMock.framework/Versions/A/Resources/License.txt deleted file mode 100644 index e2c13960..00000000 --- a/Frameworks/OCMock.framework/Versions/A/Resources/License.txt +++ /dev/null @@ -1,15 +0,0 @@ - - Copyright (c) 2004-2009 by Mulle Kybernetik. All rights reserved. - - Permission to use, copy, modify and distribute this software and its documentation - is hereby granted, provided that both the copyright notice and this permission - notice appear in all copies of the software, derivative works or modified versions, - and any portions thereof, and that both notices appear in supporting documentation, - and that credit is given to Mulle Kybernetik in all documents and publicity - pertaining to direct or indirect use of this code or its derivatives. - - THIS IS EXPERIMENTAL SOFTWARE AND IT IS KNOWN TO HAVE BUGS, SOME OF WHICH MAY HAVE - SERIOUS CONSEQUENCES. THE COPYRIGHT HOLDER ALLOWS FREE USE OF THIS SOFTWARE IN ITS - "AS IS" CONDITION. THE COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY - DAMAGES WHATSOEVER RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE - OR OF ANY DERIVATIVE WORK.
\ No newline at end of file diff --git a/Frameworks/OCMock.framework/Versions/Current b/Frameworks/OCMock.framework/Versions/Current deleted file mode 120000 index 8c7e5a66..00000000 --- a/Frameworks/OCMock.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/Frameworks/zlib/libz.a b/Frameworks/zlib/libz.a Binary files differdeleted file mode 100644 index 08144dda..00000000 --- a/Frameworks/zlib/libz.a +++ /dev/null diff --git a/Frameworks/zlib/zlib.1.2.4.h b/Frameworks/zlib/zlib.1.2.4.h deleted file mode 100644 index f5785be7..00000000 --- a/Frameworks/zlib/zlib.1.2.4.h +++ /dev/null @@ -1,1605 +0,0 @@ -/* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.4, Mar 14th, 2010 - - Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu - - - The data format used by the zlib library is described by RFCs (Request for - Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt - (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). -*/ - -#ifndef ZLIB_H -#define ZLIB_H - -#include "zconf.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define ZLIB_VERSION "1.2.4" -#define ZLIB_VERNUM 0x1240 -#define ZLIB_VER_MAJOR 1 -#define ZLIB_VER_MINOR 2 -#define ZLIB_VER_REVISION 4 -#define ZLIB_VER_SUBREVISION 0 - -/* - The 'zlib' compression library provides in-memory compression and - decompression functions, including integrity checks of the uncompressed data. - This version of the library supports only one compression method (deflation) - but other algorithms will be added later and will have the same stream - interface. - - Compression can be done in a single step if the buffers are large enough, - or can be done by repeated calls of the compression function. In the latter - case, the application must provide more input and/or consume the output - (providing more output space) before each call. - - The compressed data format used by default by the in-memory functions is - the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped - around a deflate stream, which is itself documented in RFC 1951. - - The library also supports reading and writing files in gzip (.gz) format - with an interface similar to that of stdio using the functions that start - with "gz". The gzip format is different from the zlib format. gzip is a - gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. - - This library can optionally read and write gzip streams in memory as well. - - The zlib format was designed to be compact and fast for use in memory - and on communications channels. The gzip format was designed for single- - file compression on file systems, has a larger header than zlib to maintain - directory information, and uses a different, slower check method than zlib. - - The library does not install any signal handler. The decoder checks - the consistency of the compressed data, so the library should never crash - even in case of corrupted input. -*/ - -typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); -typedef void (*free_func) OF((voidpf opaque, voidpf address)); - -struct internal_state; - -typedef struct z_stream_s { - Bytef *next_in; /* next input byte */ - uInt avail_in; /* number of bytes available at next_in */ - uLong total_in; /* total nb of input bytes read so far */ - - Bytef *next_out; /* next output byte should be put there */ - uInt avail_out; /* remaining free space at next_out */ - uLong total_out; /* total nb of bytes output so far */ - - char *msg; /* last error message, NULL if no error */ - struct internal_state FAR *state; /* not visible by applications */ - - alloc_func zalloc; /* used to allocate the internal state */ - free_func zfree; /* used to free the internal state */ - voidpf opaque; /* private data object passed to zalloc and zfree */ - - int data_type; /* best guess about the data type: binary or text */ - uLong adler; /* adler32 value of the uncompressed data */ - uLong reserved; /* reserved for future use */ -} z_stream; - -typedef z_stream FAR *z_streamp; - -/* - gzip header information passed to and from zlib routines. See RFC 1952 - for more details on the meanings of these fields. -*/ -typedef struct gz_header_s { - int text; /* true if compressed data believed to be text */ - uLong time; /* modification time */ - int xflags; /* extra flags (not used when writing a gzip file) */ - int os; /* operating system */ - Bytef *extra; /* pointer to extra field or Z_NULL if none */ - uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ - uInt extra_max; /* space at extra (only when reading header) */ - Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ - uInt name_max; /* space at name (only when reading header) */ - Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ - uInt comm_max; /* space at comment (only when reading header) */ - int hcrc; /* true if there was or will be a header crc */ - int done; /* true when done reading gzip header (not used - when writing a gzip file) */ -} gz_header; - -typedef gz_header FAR *gz_headerp; - -/* - The application must update next_in and avail_in when avail_in has dropped - to zero. It must update next_out and avail_out when avail_out has dropped - to zero. The application must initialize zalloc, zfree and opaque before - calling the init function. All other fields are set by the compression - library and must not be updated by the application. - - The opaque value provided by the application will be passed as the first - parameter for calls of zalloc and zfree. This can be useful for custom - memory management. The compression library attaches no meaning to the - opaque value. - - zalloc must return Z_NULL if there is not enough memory for the object. - If zlib is used in a multi-threaded application, zalloc and zfree must be - thread safe. - - On 16-bit systems, the functions zalloc and zfree must be able to allocate - exactly 65536 bytes, but will not be required to allocate more than this if - the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers - returned by zalloc for objects of exactly 65536 bytes *must* have their - offset normalized to zero. The default allocation function provided by this - library ensures this (see zutil.c). To reduce memory requirements and avoid - any allocation of 64K objects, at the expense of compression ratio, compile - the library with -DMAX_WBITS=14 (see zconf.h). - - The fields total_in and total_out can be used for statistics or progress - reports. After compression, total_in holds the total size of the - uncompressed data and may be saved for use in the decompressor (particularly - if the decompressor wants to decompress everything in a single step). -*/ - - /* constants */ - -#define Z_NO_FLUSH 0 -#define Z_PARTIAL_FLUSH 1 -#define Z_SYNC_FLUSH 2 -#define Z_FULL_FLUSH 3 -#define Z_FINISH 4 -#define Z_BLOCK 5 -#define Z_TREES 6 -/* Allowed flush values; see deflate() and inflate() below for details */ - -#define Z_OK 0 -#define Z_STREAM_END 1 -#define Z_NEED_DICT 2 -#define Z_ERRNO (-1) -#define Z_STREAM_ERROR (-2) -#define Z_DATA_ERROR (-3) -#define Z_MEM_ERROR (-4) -#define Z_BUF_ERROR (-5) -#define Z_VERSION_ERROR (-6) -/* Return codes for the compression/decompression functions. Negative values - * are errors, positive values are used for special but normal events. - */ - -#define Z_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) -/* compression levels */ - -#define Z_FILTERED 1 -#define Z_HUFFMAN_ONLY 2 -#define Z_RLE 3 -#define Z_FIXED 4 -#define Z_DEFAULT_STRATEGY 0 -/* compression strategy; see deflateInit2() below for details */ - -#define Z_BINARY 0 -#define Z_TEXT 1 -#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ -#define Z_UNKNOWN 2 -/* Possible values of the data_type field (though see inflate()) */ - -#define Z_DEFLATED 8 -/* The deflate compression method (the only one supported in this version) */ - -#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ - -#define zlib_version zlibVersion() -/* for compatibility with versions < 1.0.2 */ - - - /* basic functions */ - -ZEXTERN const char * ZEXPORT zlibVersion OF((void)); -/* The application can compare zlibVersion and ZLIB_VERSION for consistency. - If the first character differs, the library code actually used is not - compatible with the zlib.h header file used by the application. This check - is automatically made by deflateInit and inflateInit. - */ - -/* -ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); - - Initializes the internal stream state for compression. The fields - zalloc, zfree and opaque must be initialized before by the caller. If - zalloc and zfree are set to Z_NULL, deflateInit updates them to use default - allocation functions. - - The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: - 1 gives best speed, 9 gives best compression, 0 gives no compression at all - (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION - requests a default compromise between speed and compression (currently - equivalent to level 6). - - deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if level is not a valid compression level, or - Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible - with the version assumed by the caller (ZLIB_VERSION). msg is set to null - if there is no error message. deflateInit does not perform any compression: - this will be done by deflate(). -*/ - - -ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); -/* - deflate compresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce - some output latency (reading input without producing any output) except when - forced to flush. - - The detailed semantics are as follows. deflate performs one or both of the - following actions: - - - Compress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in and avail_in are updated and - processing will resume at this point for the next call of deflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. This action is forced if the parameter flush is non zero. - Forcing flush frequently degrades the compression ratio, so this parameter - should be set only when necessary (in interactive applications). Some - output may be provided even if flush is not set. - - Before the call of deflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming more - output, and updating avail_in or avail_out accordingly; avail_out should - never be zero before the call. The application can consume the compressed - output when it wants, for example when the output buffer is full (avail_out - == 0), or after each call of deflate(). If deflate returns Z_OK and with - zero avail_out, it must be called again after making room in the output - buffer because there might be more output pending. - - Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to - decide how much data to accumulate before producing output, in order to - maximize compression. - - If the parameter flush is set to Z_SYNC_FLUSH, all pending output is - flushed to the output buffer and the output is aligned on a byte boundary, so - that the decompressor can get all input data available so far. (In - particular avail_in is zero after the call if enough output space has been - provided before the call.) Flushing may degrade compression for some - compression algorithms and so it should be used only when necessary. This - completes the current deflate block and follows it with an empty stored block - that is three bits plus filler bits to the next byte, followed by four bytes - (00 00 ff ff). - - If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the - output buffer, but the output is not aligned to a byte boundary. All of the - input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. - This completes the current deflate block and follows it with an empty fixed - codes block that is 10 bits long. This assures that enough bytes are output - in order for the decompressor to finish the block before the empty fixed code - block. - - If flush is set to Z_BLOCK, a deflate block is completed and emitted, as - for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to - seven bits of the current block are held to be written as the next byte after - the next deflate block is completed. In this case, the decompressor may not - be provided enough bits at this point in order to complete decompression of - the data provided so far to the compressor. It may need to wait for the next - block to be emitted. This is for advanced applications that need to control - the emission of deflate blocks. - - If flush is set to Z_FULL_FLUSH, all output is flushed as with - Z_SYNC_FLUSH, and the compression state is reset so that decompression can - restart from this point if previous compressed data has been damaged or if - random access is desired. Using Z_FULL_FLUSH too often can seriously degrade - compression. - - If deflate returns with avail_out == 0, this function must be called again - with the same value of the flush parameter and more output space (updated - avail_out), until the flush is complete (deflate returns with non-zero - avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that - avail_out is greater than six to avoid repeated flush markers due to - avail_out == 0 on return. - - If the parameter flush is set to Z_FINISH, pending input is processed, - pending output is flushed and deflate returns with Z_STREAM_END if there was - enough output space; if deflate returns with Z_OK, this function must be - called again with Z_FINISH and more output space (updated avail_out) but no - more input data, until it returns with Z_STREAM_END or an error. After - deflate has returned Z_STREAM_END, the only possible operations on the stream - are deflateReset or deflateEnd. - - Z_FINISH can be used immediately after deflateInit if all the compression - is to be done in a single step. In this case, avail_out must be at least the - value returned by deflateBound (see below). If deflate does not return - Z_STREAM_END, then it must be called again as described above. - - deflate() sets strm->adler to the adler32 checksum of all input read - so far (that is, total_in bytes). - - deflate() may update strm->data_type if it can make a good guess about - the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered - binary. This field is only for information purposes and does not affect the - compression algorithm in any manner. - - deflate() returns Z_OK if some progress has been made (more input - processed or more output produced), Z_STREAM_END if all input has been - consumed and all output has been produced (only when flush is set to - Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible - (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not - fatal, and deflate() can be called again with more input and more output - space to continue compressing. -*/ - - -ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any pending - output. - - deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the - stream state was inconsistent, Z_DATA_ERROR if the stream was freed - prematurely (some input or output was discarded). In the error case, msg - may be set but then points to a static string (which must not be - deallocated). -*/ - - -/* -ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); - - Initializes the internal stream state for decompression. The fields - next_in, avail_in, zalloc, zfree and opaque must be initialized before by - the caller. If next_in is not Z_NULL and avail_in is large enough (the - exact value depends on the compression method), inflateInit determines the - compression method from the zlib header and allocates all data structures - accordingly; otherwise the allocation will be deferred to the first call of - inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to - use default allocation functions. - - inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller, or Z_STREAM_ERROR if the parameters are - invalid, such as a null pointer to the structure. msg is set to null if - there is no error message. inflateInit does not perform any decompression - apart from possibly reading the zlib header if present: actual decompression - will be done by inflate(). (So next_in and avail_in may be modified, but - next_out and avail_out are unused and unchanged.) The current implementation - of inflateInit() does not process any header information -- that is deferred - until inflate() is called. -*/ - - -ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); -/* - inflate decompresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce - some output latency (reading input without producing any output) except when - forced to flush. - - The detailed semantics are as follows. inflate performs one or both of the - following actions: - - - Decompress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in is updated and processing will - resume at this point for the next call of inflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. inflate() provides as much output as possible, until there is - no more input data or no more space in the output buffer (see below about - the flush parameter). - - Before the call of inflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming more - output, and updating the next_* and avail_* values accordingly. The - application can consume the uncompressed output when it wants, for example - when the output buffer is full (avail_out == 0), or after each call of - inflate(). If inflate returns Z_OK and with zero avail_out, it must be - called again after making room in the output buffer because there might be - more output pending. - - The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, - Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much - output as possible to the output buffer. Z_BLOCK requests that inflate() - stop if and when it gets to the next deflate block boundary. When decoding - the zlib or gzip format, this will cause inflate() to return immediately - after the header and before the first block. When doing a raw inflate, - inflate() will go ahead and process the first block, and will return when it - gets to the end of that block, or when it runs out of data. - - The Z_BLOCK option assists in appending to or combining deflate streams. - Also to assist in this, on return inflate() will set strm->data_type to the - number of unused bits in the last byte taken from strm->next_in, plus 64 if - inflate() is currently decoding the last block in the deflate stream, plus - 128 if inflate() returned immediately after decoding an end-of-block code or - decoding the complete header up to just before the first byte of the deflate - stream. The end-of-block will not be indicated until all of the uncompressed - data from that block has been written to strm->next_out. The number of - unused bits may in general be greater than seven, except when bit 7 of - data_type is set, in which case the number of unused bits will be less than - eight. data_type is set as noted here every time inflate() returns for all - flush options, and so can be used to determine the amount of currently - consumed input in bits. - - The Z_TREES option behaves as Z_BLOCK does, but it also returns when the - end of each deflate block header is reached, before any actual data in that - block is decoded. This allows the caller to determine the length of the - deflate block header for later use in random access within a deflate block. - 256 is added to the value of strm->data_type when inflate() returns - immediately after reaching the end of the deflate block header. - - inflate() should normally be called until it returns Z_STREAM_END or an - error. However if all decompression is to be performed in a single step (a - single call of inflate), the parameter flush should be set to Z_FINISH. In - this case all pending input is processed and all pending output is flushed; - avail_out must be large enough to hold all the uncompressed data. (The size - of the uncompressed data may have been saved by the compressor for this - purpose.) The next operation on this stream must be inflateEnd to deallocate - the decompression state. The use of Z_FINISH is never required, but can be - used to inform inflate that a faster approach may be used for the single - inflate() call. - - In this implementation, inflate() always flushes as much output as - possible to the output buffer, and always uses the faster approach on the - first call. So the only effect of the flush parameter in this implementation - is on the return value of inflate(), as noted below, or when it returns early - because Z_BLOCK or Z_TREES is used. - - If a preset dictionary is needed after this call (see inflateSetDictionary - below), inflate sets strm->adler to the adler32 checksum of the dictionary - chosen by the compressor and returns Z_NEED_DICT; otherwise it sets - strm->adler to the adler32 checksum of all output produced so far (that is, - total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described - below. At the end of the stream, inflate() checks that its computed adler32 - checksum is equal to that saved by the compressor and returns Z_STREAM_END - only if the checksum is correct. - - inflate() can decompress and check either zlib-wrapped or gzip-wrapped - deflate data. The header type is detected automatically, if requested when - initializing with inflateInit2(). Any information contained in the gzip - header is not retained, so applications that need that information should - instead use raw inflate, see inflateInit2() below, or inflateBack() and - perform their own processing of the gzip header and trailer. - - inflate() returns Z_OK if some progress has been made (more input processed - or more output produced), Z_STREAM_END if the end of the compressed data has - been reached and all uncompressed output has been produced, Z_NEED_DICT if a - preset dictionary is needed at this point, Z_DATA_ERROR if the input data was - corrupted (input stream not conforming to the zlib format or incorrect check - value), Z_STREAM_ERROR if the stream structure was inconsistent (for example - next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, - Z_BUF_ERROR if no progress is possible or if there was not enough room in the - output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and - inflate() can be called again with more input and more output space to - continue decompressing. If Z_DATA_ERROR is returned, the application may - then call inflateSync() to look for a good compression block if a partial - recovery of the data is desired. -*/ - - -ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any pending - output. - - inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state - was inconsistent. In the error case, msg may be set but then points to a - static string (which must not be deallocated). -*/ - - - /* Advanced functions */ - -/* - The following functions are needed only in some special applications. -*/ - -/* -ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, - int level, - int method, - int windowBits, - int memLevel, - int strategy)); - - This is another version of deflateInit with more compression options. The - fields next_in, zalloc, zfree and opaque must be initialized before by the - caller. - - The method parameter is the compression method. It must be Z_DEFLATED in - this version of the library. - - The windowBits parameter is the base two logarithm of the window size - (the size of the history buffer). It should be in the range 8..15 for this - version of the library. Larger values of this parameter result in better - compression at the expense of memory usage. The default value is 15 if - deflateInit is used instead. - - windowBits can also be -8..-15 for raw deflate. In this case, -windowBits - determines the window size. deflate() will then generate raw deflate data - with no zlib header or trailer, and will not compute an adler32 check value. - - windowBits can also be greater than 15 for optional gzip encoding. Add - 16 to windowBits to write a simple gzip header and trailer around the - compressed data instead of a zlib wrapper. The gzip header will have no - file name, no extra data, no comment, no modification time (set to zero), no - header crc, and the operating system will be set to 255 (unknown). If a - gzip stream is being written, strm->adler is a crc32 instead of an adler32. - - The memLevel parameter specifies how much memory should be allocated - for the internal compression state. memLevel=1 uses minimum memory but is - slow and reduces compression ratio; memLevel=9 uses maximum memory for - optimal speed. The default value is 8. See zconf.h for total memory usage - as a function of windowBits and memLevel. - - The strategy parameter is used to tune the compression algorithm. Use the - value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a - filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no - string match), or Z_RLE to limit match distances to one (run-length - encoding). Filtered data consists mostly of small values with a somewhat - random distribution. In this case, the compression algorithm is tuned to - compress them better. The effect of Z_FILTERED is to force more Huffman - coding and less string matching; it is somewhat intermediate between - Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as - fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The - strategy parameter only affects the compression ratio but not the - correctness of the compressed output even if it is not set appropriately. - Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler - decoder for special applications. - - deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid - method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is - incompatible with the version assumed by the caller (ZLIB_VERSION). msg is - set to null if there is no error message. deflateInit2 does not perform any - compression: this will be done by deflate(). -*/ - -ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the compression dictionary from the given byte sequence - without producing any compressed output. This function must be called - immediately after deflateInit, deflateInit2 or deflateReset, before any call - of deflate. The compressor and decompressor must use exactly the same - dictionary (see inflateSetDictionary). - - The dictionary should consist of strings (byte sequences) that are likely - to be encountered later in the data to be compressed, with the most commonly - used strings preferably put towards the end of the dictionary. Using a - dictionary is most useful when the data to be compressed is short and can be - predicted with good accuracy; the data can then be compressed better than - with the default empty dictionary. - - Depending on the size of the compression data structures selected by - deflateInit or deflateInit2, a part of the dictionary may in effect be - discarded, for example if the dictionary is larger than the window size - provided in deflateInit or deflateInit2. Thus the strings most likely to be - useful should be put at the end of the dictionary, not at the front. In - addition, the current implementation of deflate will use at most the window - size minus 262 bytes of the provided dictionary. - - Upon return of this function, strm->adler is set to the adler32 value - of the dictionary; the decompressor may later use this value to determine - which dictionary has been used by the compressor. (The adler32 value - applies to the whole dictionary even if only a subset of the dictionary is - actually used by the compressor.) If a raw deflate was requested, then the - adler32 value is not computed and strm->adler is not set. - - deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a - parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is - inconsistent (for example if deflate has already been called for this stream - or if the compression method is bsort). deflateSetDictionary does not - perform any compression: this will be done by deflate(). -*/ - -ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, - z_streamp source)); -/* - Sets the destination stream as a complete copy of the source stream. - - This function can be useful when several compression strategies will be - tried, for example when there are several ways of pre-processing the input - data with a filter. The streams that will be discarded should then be freed - by calling deflateEnd. Note that deflateCopy duplicates the internal - compression state which can be quite large, so this strategy is slow and can - consume lots of memory. - - deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being Z_NULL). msg is left unchanged in both source and - destination. -*/ - -ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); -/* - This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. The - stream will keep the same compression level and any other attributes that - may have been set by deflateInit2. - - deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL). -*/ - -ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, - int level, - int strategy)); -/* - Dynamically update the compression level and compression strategy. The - interpretation of level and strategy is as in deflateInit2. This can be - used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data requiring a different strategy. - If the compression level is changed, the input available so far is - compressed with the old level (and may be flushed); the new level will take - effect only at the next call of deflate(). - - Before the call of deflateParams, the stream state must be set as for - a call of deflate(), since the currently available input may have to be - compressed and flushed. In particular, strm->avail_out must be non-zero. - - deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source - stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if - strm->avail_out was zero. -*/ - -ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, - int good_length, - int max_lazy, - int nice_length, - int max_chain)); -/* - Fine tune deflate's internal compression parameters. This should only be - used by someone who understands the algorithm used by zlib's deflate for - searching for the best matching string, and even then only by the most - fanatic optimizer trying to squeeze out the last compressed bit for their - specific input data. Read the deflate.c source code for the meaning of the - max_lazy, good_length, nice_length, and max_chain parameters. - - deflateTune() can be called after deflateInit() or deflateInit2(), and - returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. - */ - -ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, - uLong sourceLen)); -/* - deflateBound() returns an upper bound on the compressed size after - deflation of sourceLen bytes. It must be called after deflateInit() or - deflateInit2(), and after deflateSetHeader(), if used. This would be used - to allocate an output buffer for deflation in a single pass, and so would be - called before deflate(). -*/ - -ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, - int bits, - int value)); -/* - deflatePrime() inserts bits in the deflate output stream. The intent - is that this function is used to start off the deflate output with the bits - leftover from a previous deflate stream when appending to it. As such, this - function can only be used for raw deflate, and must be used before the first - deflate() call after a deflateInit2() or deflateReset(). bits must be less - than or equal to 16, and that many of the least significant bits of value - will be inserted in the output. - - deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, - gz_headerp head)); -/* - deflateSetHeader() provides gzip header information for when a gzip - stream is requested by deflateInit2(). deflateSetHeader() may be called - after deflateInit2() or deflateReset() and before the first call of - deflate(). The text, time, os, extra field, name, and comment information - in the provided gz_header structure are written to the gzip header (xflag is - ignored -- the extra flags are set according to the compression level). The - caller must assure that, if not Z_NULL, name and comment are terminated with - a zero byte, and that if extra is not Z_NULL, that extra_len bytes are - available there. If hcrc is true, a gzip header crc is included. Note that - the current versions of the command-line version of gzip (up through version - 1.3.x) do not support header crc's, and will report that it is a "multi-part - gzip file" and give up. - - If deflateSetHeader is not used, the default gzip header has text false, - the time set to zero, and os set to 255, with no extra, name, or comment - fields. The gzip header is returned to the default state by deflateReset(). - - deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -/* -ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, - int windowBits)); - - This is another version of inflateInit with an extra parameter. The - fields next_in, avail_in, zalloc, zfree and opaque must be initialized - before by the caller. - - The windowBits parameter is the base two logarithm of the maximum window - size (the size of the history buffer). It should be in the range 8..15 for - this version of the library. The default value is 15 if inflateInit is used - instead. windowBits must be greater than or equal to the windowBits value - provided to deflateInit2() while compressing, or it must be equal to 15 if - deflateInit2() was not used. If a compressed stream with a larger window - size is given as input, inflate() will return with the error code - Z_DATA_ERROR instead of trying to allocate a larger window. - - windowBits can also be zero to request that inflate use the window size in - the zlib header of the compressed stream. - - windowBits can also be -8..-15 for raw inflate. In this case, -windowBits - determines the window size. inflate() will then process raw deflate data, - not looking for a zlib or gzip header, not generating a check value, and not - looking for any check values for comparison at the end of the stream. This - is for use with other formats that use the deflate compressed data format - such as zip. Those formats provide their own check values. If a custom - format is developed using the raw deflate format for compressed data, it is - recommended that a check value such as an adler32 or a crc32 be applied to - the uncompressed data as is done in the zlib, gzip, and zip formats. For - most applications, the zlib format should be used as is. Note that comments - above on the use in deflateInit2() applies to the magnitude of windowBits. - - windowBits can also be greater than 15 for optional gzip decoding. Add - 32 to windowBits to enable zlib and gzip decoding with automatic header - detection, or add 16 to decode only the gzip format (the zlib format will - return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a - crc32 instead of an adler32. - - inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller, or Z_STREAM_ERROR if the parameters are - invalid, such as a null pointer to the structure. msg is set to null if - there is no error message. inflateInit2 does not perform any decompression - apart from possibly reading the zlib header if present: actual decompression - will be done by inflate(). (So next_in and avail_in may be modified, but - next_out and avail_out are unused and unchanged.) The current implementation - of inflateInit2() does not process any header information -- that is - deferred until inflate() is called. -*/ - -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the decompression dictionary from the given uncompressed byte - sequence. This function must be called immediately after a call of inflate, - if that call returned Z_NEED_DICT. The dictionary chosen by the compressor - can be determined from the adler32 value returned by that call of inflate. - The compressor and decompressor must use exactly the same dictionary (see - deflateSetDictionary). For raw inflate, this function can be called - immediately after inflateInit2() or inflateReset() and before any call of - inflate() to set the dictionary. The application must insure that the - dictionary that was used for compression is provided. - - inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a - parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is - inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the - expected one (incorrect adler32 value). inflateSetDictionary does not - perform any decompression: this will be done by subsequent calls of - inflate(). -*/ - -ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); -/* - Skips invalid compressed data until a full flush point (see above the - description of deflate with Z_FULL_FLUSH) can be found, or until all - available input is skipped. No output is provided. - - inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR - if no more input was provided, Z_DATA_ERROR if no flush point has been - found, or Z_STREAM_ERROR if the stream structure was inconsistent. In the - success case, the application may save the current current value of total_in - which indicates where valid compressed data was found. In the error case, - the application may repeatedly call inflateSync, providing more input each - time, until success or end of the input data. -*/ - -ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, - z_streamp source)); -/* - Sets the destination stream as a complete copy of the source stream. - - This function can be useful when randomly accessing a large stream. The - first pass through the stream can periodically record the inflate state, - allowing restarting inflate at those points when randomly accessing the - stream. - - inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being Z_NULL). msg is left unchanged in both source and - destination. -*/ - -ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); -/* - This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. The - stream will keep attributes that may have been set by inflateInit2. - - inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL). -*/ - -ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, - int windowBits)); -/* - This function is the same as inflateReset, but it also permits changing - the wrap and window size requests. The windowBits parameter is interpreted - the same as it is for inflateInit2. - - inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL), or if - the windowBits parameter is invalid. -*/ - -ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, - int bits, - int value)); -/* - This function inserts bits in the inflate input stream. The intent is - that this function is used to start inflating at a bit position in the - middle of a byte. The provided bits will be used before any bytes are used - from next_in. This function should only be used with raw inflate, and - should be used before the first inflate() call after inflateInit2() or - inflateReset(). bits must be less than or equal to 16, and that many of the - least significant bits of value will be inserted in the input. - - If bits is negative, then the input stream bit buffer is emptied. Then - inflatePrime() can be called again to put bits in the buffer. This is used - to clear out bits leftover after feeding inflate a block description prior - to feeding inflate codes. - - inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); -/* - This function returns two values, one in the lower 16 bits of the return - value, and the other in the remaining upper bits, obtained by shifting the - return value down 16 bits. If the upper value is -1 and the lower value is - zero, then inflate() is currently decoding information outside of a block. - If the upper value is -1 and the lower value is non-zero, then inflate is in - the middle of a stored block, with the lower value equaling the number of - bytes from the input remaining to copy. If the upper value is not -1, then - it is the number of bits back from the current bit position in the input of - the code (literal or length/distance pair) currently being processed. In - that case the lower value is the number of bytes already emitted for that - code. - - A code is being processed if inflate is waiting for more input to complete - decoding of the code, or if it has completed decoding but is waiting for - more output space to write the literal or match data. - - inflateMark() is used to mark locations in the input data for random - access, which may be at bit positions, and to note those cases where the - output of a code may span boundaries of random access blocks. The current - location in the input stream can be determined from avail_in and data_type - as noted in the description for the Z_BLOCK flush parameter for inflate. - - inflateMark returns the value noted above or -1 << 16 if the provided - source stream state was inconsistent. -*/ - -ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, - gz_headerp head)); -/* - inflateGetHeader() requests that gzip header information be stored in the - provided gz_header structure. inflateGetHeader() may be called after - inflateInit2() or inflateReset(), and before the first call of inflate(). - As inflate() processes the gzip stream, head->done is zero until the header - is completed, at which time head->done is set to one. If a zlib stream is - being decoded, then head->done is set to -1 to indicate that there will be - no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be - used to force inflate() to return immediately after header processing is - complete and before any actual data is decompressed. - - The text, time, xflags, and os fields are filled in with the gzip header - contents. hcrc is set to true if there is a header CRC. (The header CRC - was valid if done is set to one.) If extra is not Z_NULL, then extra_max - contains the maximum number of bytes to write to extra. Once done is true, - extra_len contains the actual extra field length, and extra contains the - extra field, or that field truncated if extra_max is less than extra_len. - If name is not Z_NULL, then up to name_max characters are written there, - terminated with a zero unless the length is greater than name_max. If - comment is not Z_NULL, then up to comm_max characters are written there, - terminated with a zero unless the length is greater than comm_max. When any - of extra, name, or comment are not Z_NULL and the respective field is not - present in the header, then that field is set to Z_NULL to signal its - absence. This allows the use of deflateSetHeader() with the returned - structure to duplicate the header. However if those fields are set to - allocated memory, then the application will need to save those pointers - elsewhere so that they can be eventually freed. - - If inflateGetHeader is not used, then the header information is simply - discarded. The header is always checked for validity, including the header - CRC if present. inflateReset() will reset the process to discard the header - information. The application would need to call inflateGetHeader() again to - retrieve the header from the next gzip stream. - - inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -/* -ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, - unsigned char FAR *window)); - - Initialize the internal stream state for decompression using inflateBack() - calls. The fields zalloc, zfree and opaque in strm must be initialized - before the call. If zalloc and zfree are Z_NULL, then the default library- - derived memory allocation routines are used. windowBits is the base two - logarithm of the window size, in the range 8..15. window is a caller - supplied buffer of that size. Except for special applications where it is - assured that deflate was used with small window sizes, windowBits must be 15 - and a 32K byte window must be supplied to be able to decompress general - deflate streams. - - See inflateBack() for the usage of these routines. - - inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of - the paramaters are invalid, Z_MEM_ERROR if the internal state could not be - allocated, or Z_VERSION_ERROR if the version of the library does not match - the version of the header file. -*/ - -typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); -typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); - -ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, - in_func in, void FAR *in_desc, - out_func out, void FAR *out_desc)); -/* - inflateBack() does a raw inflate with a single call using a call-back - interface for input and output. This is more efficient than inflate() for - file i/o applications in that it avoids copying between the output and the - sliding window by simply making the window itself the output buffer. This - function trusts the application to not change the output buffer passed by - the output function, at least until inflateBack() returns. - - inflateBackInit() must be called first to allocate the internal state - and to initialize the state with the user-provided window buffer. - inflateBack() may then be used multiple times to inflate a complete, raw - deflate stream with each call. inflateBackEnd() is then called to free the - allocated state. - - A raw deflate stream is one with no zlib or gzip header or trailer. - This routine would normally be used in a utility that reads zip or gzip - files and writes out uncompressed files. The utility would decode the - header and process the trailer on its own, hence this routine expects only - the raw deflate stream to decompress. This is different from the normal - behavior of inflate(), which expects either a zlib or gzip header and - trailer around the deflate stream. - - inflateBack() uses two subroutines supplied by the caller that are then - called by inflateBack() for input and output. inflateBack() calls those - routines until it reads a complete deflate stream and writes out all of the - uncompressed data, or until it encounters an error. The function's - parameters and return types are defined above in the in_func and out_func - typedefs. inflateBack() will call in(in_desc, &buf) which should return the - number of bytes of provided input, and a pointer to that input in buf. If - there is no input available, in() must return zero--buf is ignored in that - case--and inflateBack() will return a buffer error. inflateBack() will call - out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() - should return zero on success, or non-zero on failure. If out() returns - non-zero, inflateBack() will return with an error. Neither in() nor out() - are permitted to change the contents of the window provided to - inflateBackInit(), which is also the buffer that out() uses to write from. - The length written by out() will be at most the window size. Any non-zero - amount of input may be provided by in(). - - For convenience, inflateBack() can be provided input on the first call by - setting strm->next_in and strm->avail_in. If that input is exhausted, then - in() will be called. Therefore strm->next_in must be initialized before - calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called - immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in - must also be initialized, and then if strm->avail_in is not zero, input will - initially be taken from strm->next_in[0 .. strm->avail_in - 1]. - - The in_desc and out_desc parameters of inflateBack() is passed as the - first parameter of in() and out() respectively when they are called. These - descriptors can be optionally used to pass any information that the caller- - supplied in() and out() functions need to do their job. - - On return, inflateBack() will set strm->next_in and strm->avail_in to - pass back any unused input that was provided by the last in() call. The - return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR - if in() or out() returned an error, Z_DATA_ERROR if there was a format error - in the deflate stream (in which case strm->msg is set to indicate the nature - of the error), or Z_STREAM_ERROR if the stream was not properly initialized. - In the case of Z_BUF_ERROR, an input or output error can be distinguished - using strm->next_in which will be Z_NULL only if in() returned an error. If - strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning - non-zero. (in() will always be called before out(), so strm->next_in is - assured to be defined if out() returns non-zero.) Note that inflateBack() - cannot return Z_OK. -*/ - -ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); -/* - All memory allocated by inflateBackInit() is freed. - - inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream - state was inconsistent. -*/ - -ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); -/* Return flags indicating compile-time options. - - Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: - 1.0: size of uInt - 3.2: size of uLong - 5.4: size of voidpf (pointer) - 7.6: size of z_off_t - - Compiler, assembler, and debug options: - 8: DEBUG - 9: ASMV or ASMINF -- use ASM code - 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention - 11: 0 (reserved) - - One-time table building (smaller code, but not thread-safe if true): - 12: BUILDFIXED -- build static block decoding tables when needed - 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed - 14,15: 0 (reserved) - - Library content (indicates missing functionality): - 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking - deflate code when not needed) - 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect - and decode gzip streams (to avoid linking crc code) - 18-19: 0 (reserved) - - Operation variations (changes in library functionality): - 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate - 21: FASTEST -- deflate algorithm with only one, lowest compression level - 22,23: 0 (reserved) - - The sprintf variant used by gzprintf (zero is best): - 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format - 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! - 26: 0 = returns value, 1 = void -- 1 means inferred string length returned - - Remainder: - 27-31: 0 (reserved) - */ - - - /* utility functions */ - -/* - The following utility functions are implemented on top of the basic - stream-oriented functions. To simplify the interface, some default options - are assumed (compression level and memory usage, standard memory allocation - functions). The source code of these utility functions can be modified if - you need special options. -*/ - -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total size - of the destination buffer, which must be at least the value returned by - compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed buffer. - - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. -*/ - -ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen, - int level)); -/* - Compresses the source buffer into the destination buffer. The level - parameter has the same meaning as in deflateInit. sourceLen is the byte - length of the source buffer. Upon entry, destLen is the total size of the - destination buffer, which must be at least the value returned by - compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed buffer. - - compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_BUF_ERROR if there was not enough room in the output buffer, - Z_STREAM_ERROR if the level parameter is invalid. -*/ - -ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); -/* - compressBound() returns an upper bound on the compressed size after - compress() or compress2() on sourceLen bytes. It would be used before a - compress() or compress2() call to allocate the destination buffer. -*/ - -ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total size - of the destination buffer, which must be large enough to hold the entire - uncompressed data. (The size of the uncompressed data must have been saved - previously by the compressor and transmitted to the decompressor by some - mechanism outside the scope of this compression library.) Upon exit, destLen - is the actual size of the uncompressed buffer. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. -*/ - - - /* gzip file access functions */ - -/* - This library supports reading and writing files in gzip (.gz) format with - an interface similar to that of stdio, using the functions that start with - "gz". The gzip format is different from the zlib format. gzip is a gzip - wrapper, documented in RFC 1952, wrapped around a deflate stream. -*/ - -typedef voidp gzFile; /* opaque gzip file descriptor */ - -/* -ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); - - Opens a gzip (.gz) file for reading or writing. The mode parameter is as - in fopen ("rb" or "wb") but can also include a compression level ("wb9") or - a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only - compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' - for fixed code compression as in "wb9F". (See the description of - deflateInit2 for more information about the strategy parameter.) Also "a" - can be used instead of "w" to request that the gzip stream that will be - written be appended to the file. "+" will result in an error, since reading - and writing to the same gzip file is not supported. - - gzopen can be used to read a file which is not in gzip format; in this - case gzread will directly read from the file without decompression. - - gzopen returns NULL if the file could not be opened, if there was - insufficient memory to allocate the gzFile state, or if an invalid mode was - specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). - errno can be checked to determine if the reason gzopen failed was that the - file could not be opened. -*/ - -ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); -/* - gzdopen associates a gzFile with the file descriptor fd. File descriptors - are obtained from calls like open, dup, creat, pipe or fileno (if the file - has been previously opened with fopen). The mode parameter is as in gzopen. - - The next call of gzclose on the returned gzFile will also close the file - descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor - fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, - mode);. The duplicated descriptor should be saved to avoid a leak, since - gzdopen does not close fd if it fails. - - gzdopen returns NULL if there was insufficient memory to allocate the - gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not - provided, or '+' was provided), or if fd is -1. The file descriptor is not - used until the next gz* read, write, seek, or close operation, so gzdopen - will not detect if fd is invalid (unless fd is -1). -*/ - -ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); -/* - Set the internal buffer size used by this library's functions. The - default buffer size is 8192 bytes. This function must be called after - gzopen() or gzdopen(), and before any other calls that read or write the - file. The buffer memory allocation is always deferred to the first read or - write. Two buffers are allocated, either both of the specified size when - writing, or one of the specified size and the other twice that size when - reading. A larger buffer size of, for example, 64K or 128K bytes will - noticeably increase the speed of decompression (reading). - - The new buffer size also affects the maximum length for gzprintf(). - - gzbuffer() returns 0 on success, or -1 on failure, such as being called - too late. -*/ - -ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); -/* - Dynamically update the compression level or strategy. See the description - of deflateInit2 for the meaning of these parameters. - - gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not - opened for writing. -*/ - -ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); -/* - Reads the given number of uncompressed bytes from the compressed file. If - the input file was not in gzip format, gzread copies the given number of - bytes into the buffer. - - After reaching the end of a gzip stream in the input, gzread will continue - to read, looking for another gzip stream, or failing that, reading the rest - of the input file directly without decompression. The entire input file - will be read if gzread is called until it returns less than the requested - len. - - gzread returns the number of uncompressed bytes actually read, less than - len for end of file, or -1 for error. -*/ - -ZEXTERN int ZEXPORT gzwrite OF((gzFile file, - voidpc buf, unsigned len)); -/* - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of uncompressed bytes written or 0 in case of - error. -*/ - -ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); -/* - Converts, formats, and writes the arguments to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written, or 0 in case of error. The number of - uncompressed bytes written is limited to 8191, or one less than the buffer - size given to gzbuffer(). The caller should assure that this limit is not - exceeded. If it is exceeded, then gzprintf() will return an error (0) with - nothing written. In this case, there may also be a buffer overflow with - unpredictable consequences, which is possible only if zlib was compiled with - the insecure functions sprintf() or vsprintf() because the secure snprintf() - or vsnprintf() functions were not available. This can be determined using - zlibCompileFlags(). -*/ - -ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); -/* - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - - gzputs returns the number of characters written, or -1 in case of error. -*/ - -ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); -/* - Reads bytes from the compressed file until len-1 characters are read, or a - newline character is read and transferred to buf, or an end-of-file - condition is encountered. If any characters are read or if len == 1, the - string is terminated with a null character. If no characters are read due - to an end-of-file or len < 1, then the buffer is left untouched. - - gzgets returns buf which is a null-terminated string, or it returns NULL - for end-of-file or in case of error. If there was an error, the contents at - buf are indeterminate. -*/ - -ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); -/* - Writes c, converted to an unsigned char, into the compressed file. gzputc - returns the value that was written, or -1 in case of error. -*/ - -ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); -/* - Reads one byte from the compressed file. gzgetc returns this byte or -1 - in case of end of file or error. -*/ - -ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); -/* - Push one character back onto the stream to be read as the first character - on the next read. At least one character of push-back is allowed. - gzungetc() returns the character pushed, or -1 on failure. gzungetc() will - fail if c is -1, and may fail if a character has been pushed but not read - yet. If gzungetc is used immediately after gzopen or gzdopen, at least the - output buffer size of pushed characters is allowed. (See gzbuffer above.) - The pushed character will be discarded if the stream is repositioned with - gzseek() or gzrewind(). -*/ - -ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); -/* - Flushes all pending output into the compressed file. The parameter flush - is as in the deflate() function. The return value is the zlib error number - (see function gzerror below). gzflush is only permitted when writing. - - If the flush parameter is Z_FINISH, the remaining data is written and the - gzip stream is completed in the output. If gzwrite() is called again, a new - gzip stream will be started in the output. gzread() is able to read such - concatented gzip streams. - - gzflush should be called only when strictly necessary because it will - degrade compression if called too often. -*/ - -/* -ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, - z_off_t offset, int whence)); - - Sets the starting position for the next gzread or gzwrite on the given - compressed file. The offset represents a number of bytes in the - uncompressed data stream. The whence parameter is defined as in lseek(2); - the value SEEK_END is not supported. - - If the file is opened for reading, this function is emulated but can be - extremely slow. If the file is opened for writing, only forward seeks are - supported; gzseek then compresses a sequence of zeroes up to the new - starting position. - - gzseek returns the resulting offset location as measured in bytes from - the beginning of the uncompressed stream, or -1 in case of error, in - particular if the file is opened for writing and the new starting position - would be before the current position. -*/ - -ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); -/* - Rewinds the given file. This function is supported only for reading. - - gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) -*/ - -/* -ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); - - Returns the starting position for the next gzread or gzwrite on the given - compressed file. This position represents a number of bytes in the - uncompressed data stream, and is zero when starting, even if appending or - reading a gzip stream from the middle of a file using gzdopen(). - - gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) -*/ - -/* -ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); - - Returns the current offset in the file being read or written. This offset - includes the count of bytes that precede the gzip stream, for example when - appending or when using gzdopen() for reading. When reading, the offset - does not include as yet unused buffered input. This information can be used - for a progress indicator. On error, gzoffset() returns -1. -*/ - -ZEXTERN int ZEXPORT gzeof OF((gzFile file)); -/* - Returns true (1) if the end-of-file indicator has been set while reading, - false (0) otherwise. Note that the end-of-file indicator is set only if the - read tried to go past the end of the input, but came up short. Therefore, - just like feof(), gzeof() may return false even if there is no more data to - read, in the event that the last read request was for the exact number of - bytes remaining in the input file. This will happen if the input file size - is an exact multiple of the buffer size. - - If gzeof() returns true, then the read functions will return no more data, - unless the end-of-file indicator is reset by gzclearerr() and the input file - has grown since the previous end of file was detected. -*/ - -ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); -/* - Returns true (1) if file is being copied directly while reading, or false - (0) if file is a gzip stream being decompressed. This state can change from - false to true while reading the input file if the end of a gzip stream is - reached, but is followed by data that is not another gzip stream. - - If the input file is empty, gzdirect() will return true, since the input - does not contain a gzip stream. - - If gzdirect() is used immediately after gzopen() or gzdopen() it will - cause buffers to be allocated to allow reading the file to determine if it - is a gzip file. Therefore if gzbuffer() is used, it should be called before - gzdirect(). -*/ - -ZEXTERN int ZEXPORT gzclose OF((gzFile file)); -/* - Flushes all pending output if necessary, closes the compressed file and - deallocates the (de)compression state. Note that once file is closed, you - cannot call gzerror with file, since its structures have been deallocated. - gzclose must not be called more than once on the same file, just as free - must not be called more than once on the same allocation. - - gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a - file operation error, or Z_OK on success. -*/ - -ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); -ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); -/* - Same as gzclose(), but gzclose_r() is only for use when reading, and - gzclose_w() is only for use when writing or appending. The advantage to - using these instead of gzclose() is that they avoid linking in zlib - compression or decompression code that is not used when only reading or only - writing respectively. If gzclose() is used, then both compression and - decompression code will be included the application when linking to a static - zlib library. -*/ - -ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); -/* - Returns the error message for the last error which occurred on the given - compressed file. errnum is set to zlib error number. If an error occurred - in the file system and not in the compression library, errnum is set to - Z_ERRNO and the application may consult errno to get the exact error code. - - The application must not modify the returned string. Future calls to - this function may invalidate the previously returned string. If file is - closed, then the string previously returned by gzerror will no longer be - available. - - gzerror() should be used to distinguish errors from end-of-file for those - functions above that do not distinguish those cases in their return values. -*/ - -ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); -/* - Clears the error and end-of-file flags for file. This is analogous to the - clearerr() function in stdio. This is useful for continuing to read a gzip - file that is being written concurrently. -*/ - - - /* checksum functions */ - -/* - These functions are not related to compression but are exported - anyway because they might be useful in applications using the compression - library. -*/ - -ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); -/* - Update a running Adler-32 checksum with the bytes buf[0..len-1] and - return the updated checksum. If buf is Z_NULL, this function returns the - required initial value for the checksum. - - An Adler-32 checksum is almost as reliable as a CRC32 but can be computed - much faster. - - Usage example: - - uLong adler = adler32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - adler = adler32(adler, buffer, length); - } - if (adler != original_adler) error(); -*/ - -/* -ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, - z_off_t len2)); - - Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 - and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for - each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of - seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. -*/ - -ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -/* - Update a running CRC-32 with the bytes buf[0..len-1] and return the - updated CRC-32. If buf is Z_NULL, this function returns the required - initial value for the for the crc. Pre- and post-conditioning (one's - complement) is performed within this function so it shouldn't be done by the - application. - - Usage example: - - uLong crc = crc32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - crc = crc32(crc, buffer, length); - } - if (crc != original_crc) error(); -*/ - -/* -ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); - - Combine two CRC-32 check values into one. For two sequences of bytes, - seq1 and seq2 with lengths len1 and len2, CRC-32 check values were - calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 - check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and - len2. -*/ - - - /* various hacks, don't look :) */ - -/* deflateInit and inflateInit are macros to allow checking the zlib version - * and the compiler's view of z_stream: - */ -ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, - int windowBits, int memLevel, - int strategy, const char *version, - int stream_size)); -ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, - unsigned char FAR *window, - const char *version, - int stream_size)); -#define deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) -#define inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) -#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ - deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, sizeof(z_stream)) -#define inflateInit2(strm, windowBits) \ - inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) -#define inflateBackInit(strm, windowBits, window) \ - inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, sizeof(z_stream)) - -#ifdef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN off64_t ZEXPORT gzseek64 OF((gzFile, off64_t, int)); - ZEXTERN off64_t ZEXPORT gztell64 OF((gzFile)); - ZEXTERN off64_t ZEXPORT gzoffset64 OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off64_t)); - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off64_t)); -#endif - -#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS == 64 -# define gzopen gzopen64 -# define gzseek gzseek64 -# define gztell gztell64 -# define gzoffset gzoffset64 -# define adler32_combine adler32_combine64 -# define crc32_combine crc32_combine64 -# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN off_t ZEXPORT gzseek64 OF((gzFile, off_t, int)); - ZEXTERN off_t ZEXPORT gztell64 OF((gzFile)); - ZEXTERN off_t ZEXPORT gzoffset64 OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off_t)); - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off_t)); -# endif -#else - ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); - ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); -#endif - -#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; /* hack for buggy compilers */ -#endif - -ZEXTERN const char * ZEXPORT zError OF((int)); -ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); -ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); -ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); - -#ifdef __cplusplus -} -#endif - -#endif /* ZLIB_H */ diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index c9944020..4e735959 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -3,7 +3,7 @@ <data> <int key="IBDocument.SystemTarget">1050</int> <string key="IBDocument.SystemVersion">10D2094</string> - <string key="IBDocument.InterfaceBuilderVersion">762</string> + <string key="IBDocument.InterfaceBuilderVersion">740</string> <string key="IBDocument.AppKitVersion">1038.29</string> <string key="IBDocument.HIToolboxVersion">460.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> @@ -16,13 +16,14 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>762</string> - <string>762</string> + <string>740</string> + <string>740</string> <string>1.2.5</string> </object> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="6180"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -281,7 +282,6 @@ </object> <string key="NSFrame">{{1, 1}, {218, 38}}</string> <reference key="NSSuperview" ref="607475905"/> - <reference key="NSNextKeyView" ref="970881282"/> <reference key="NSDocView" ref="970881282"/> <object class="NSColor" key="NSBGColor" id="1024678221"> <int key="NSColorSpace">6</int> @@ -313,7 +313,6 @@ </object> <string key="NSFrame">{{-1, -13}, {220.212, 40}}</string> <reference key="NSSuperview" ref="801427893"/> - <reference key="NSNextKeyView" ref="494991824"/> <int key="NSsFlags">2</int> <reference key="NSVScroller" ref="196112633"/> <reference key="NSHScroller" ref="142487484"/> @@ -411,7 +410,6 @@ </object> <string key="NSFrameSize">{214, 354}</string> <reference key="NSSuperview" ref="233472824"/> - <reference key="NSNextKeyView" ref="251040077"/> <reference key="NSDocView" ref="251040077"/> <reference key="NSBGColor" ref="1024678221"/> <int key="NScvFlags">4</int> @@ -439,7 +437,6 @@ </object> <string key="NSFrameSize">{214, 354}</string> <reference key="NSSuperview" ref="1017775084"/> - <reference key="NSNextKeyView" ref="73685676"/> <int key="NSsFlags">528</int> <reference key="NSVScroller" ref="693168867"/> <reference key="NSHScroller" ref="656188692"/> @@ -575,7 +572,6 @@ </object> <string key="NSFrameSize">{214, 145}</string> <reference key="NSSuperview" ref="298226231"/> - <reference key="NSNextKeyView" ref="347093764"/> <reference key="NSDocView" ref="347093764"/> <reference key="NSBGColor" ref="1024678221"/> <int key="NScvFlags">6</int> @@ -603,7 +599,6 @@ </object> <string key="NSFrameSize">{214, 145}</string> <reference key="NSSuperview" ref="192579410"/> - <reference key="NSNextKeyView" ref="685057119"/> <int key="NSsFlags">512</int> <reference key="NSVScroller" ref="245346414"/> <reference key="NSHScroller" ref="353686052"/> @@ -784,7 +779,7 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="321871356"/> </object> - <object class="NSMenuItem" id="215466732"> + <object class="NSMenuItem" id="921730788"> <reference key="NSMenu" ref="890046805"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> @@ -796,7 +791,7 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="321871356"/> </object> - <object class="NSMenuItem" id="570147191"> + <object class="NSMenuItem" id="905049710"> <reference key="NSMenu" ref="890046805"/> <string key="NSTitle">Show Create Table Syntax...</string> <string key="NSKeyEquiv"/> @@ -808,6 +803,7 @@ </object> </object> </object> + <int key="NSSelectedIndex">7</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -3981,7 +3977,6 @@ </object> <string key="NSFrame">{{1, 1}, {542, 69}}</string> <reference key="NSSuperview" ref="709531668"/> - <reference key="NSNextKeyView" ref="69074373"/> <reference key="NSDocView" ref="69074373"/> <reference key="NSBGColor" ref="449903125"/> <reference key="NSCursor" ref="32917531"/> @@ -4011,7 +4006,6 @@ </object> <string key="NSFrame">{{96, 0}, {555, 71}}</string> <reference key="NSSuperview" ref="259390764"/> - <reference key="NSNextKeyView" ref="78677381"/> <int key="NSsFlags">18</int> <reference key="NSVScroller" ref="892376800"/> <reference key="NSHScroller" ref="490174802"/> @@ -4119,7 +4113,6 @@ </object> <string key="NSFrame">{{1, 1}, {542, 196}}</string> <reference key="NSSuperview" ref="449863508"/> - <reference key="NSNextKeyView" ref="421486962"/> <reference key="NSDocView" ref="421486962"/> <reference key="NSBGColor" ref="449903125"/> <reference key="NSCursor" ref="32917531"/> @@ -4149,7 +4142,6 @@ </object> <string key="NSFrame">{{96, 0}, {555, 198}}</string> <reference key="NSSuperview" ref="983998494"/> - <reference key="NSNextKeyView" ref="637054939"/> <int key="NSsFlags">18</int> <reference key="NSVScroller" ref="633929130"/> <reference key="NSHScroller" ref="883667132"/> @@ -6005,237 +5997,6 @@ <string key="NSMinSize">{292, 134}</string> <string key="NSMaxSize">{292, 134}</string> </object> - <object class="NSWindowTemplate" id="1003190366"> - <int key="NSWindowStyleMask">1</int> - <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{343, 483}, {292, 132}}</string> - <int key="NSWTFlags">1886912512</int> - <string key="NSWindowTitle">Duplicate Database</string> - <string key="NSWindowClass">NSWindow</string> - <object class="NSMutableString" key="NSViewClass"> - <characters key="NS.bytes">View</characters> - </object> - <string key="NSWindowContentMaxSize">{292, 132}</string> - <string key="NSWindowContentMinSize">{292, 132}</string> - <object class="NSView" key="NSWindowView" id="351046403"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="941161511"> - <reference key="NSNextResponder" ref="351046403"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{17, 98}, {258, 14}}</string> - <reference key="NSSuperview" ref="351046403"/> - <reference key="NSWindow"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="292220806"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4195328</int> - <string key="NSContents">Duplicate database to</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="941161511"/> - <reference key="NSBackgroundColor" ref="62854682"/> - <reference key="NSTextColor" ref="454249633"/> - </object> - </object> - <object class="NSTextField" id="362774263"> - <reference key="NSNextResponder" ref="351046403"/> - <int key="NSvFlags">258</int> - <string key="NSFrame">{{20, 72}, {252, 18}}</string> - <reference key="NSSuperview" ref="351046403"/> - <reference key="NSWindow"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="322980098"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">4326400</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="362774263"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="480189472"/> - <reference key="NSTextColor" ref="690893883"/> - </object> - </object> - <object class="NSButton" id="61396236"> - <reference key="NSNextResponder" ref="351046403"/> - <int key="NSvFlags">259</int> - <string key="NSFrame">{{204, 13}, {77, 28}}</string> - <reference key="NSSuperview" ref="351046403"/> - <reference key="NSWindow"/> - <int key="NSTag">1</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="261586860"> - <int key="NSCellFlags">604110336</int> - <int key="NSCellFlags2">138018816</int> - <string key="NSContents">Duplicate</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="61396236"/> - <int key="NSTag">1</int> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="932958253"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="41421287"> - <reference key="NSNextResponder" ref="351046403"/> - <int key="NSvFlags">259</int> - <string key="NSFrame">{{136, 13}, {70, 28}}</string> - <reference key="NSSuperview" ref="351046403"/> - <reference key="NSWindow"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1011860722"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">138018816</int> - <string key="NSContents">Cancel</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="41421287"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="932958253"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="560080814"> - <reference key="NSNextResponder" ref="351046403"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{18, 48}, {256, 18}}</string> - <reference key="NSSuperview" ref="351046403"/> - <reference key="NSWindow"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="852298622"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Duplicate database content</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="560080814"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="653588312"/> - <reference key="NSAlternateImage" ref="386686735"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </object> - <string key="NSFrameSize">{292, 132}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> - </object> - <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> - <string key="NSMinSize">{292, 154}</string> - <string key="NSMaxSize">{292, 154}</string> - </object> - <object class="NSWindowTemplate" id="223499819"> - <int key="NSWindowStyleMask">1</int> - <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{343, 483}, {292, 110}}</string> - <int key="NSWTFlags">1886912512</int> - <string key="NSWindowTitle">Rename Database</string> - <string key="NSWindowClass">NSWindow</string> - <object class="NSMutableString" key="NSViewClass"> - <characters key="NS.bytes">View</characters> - </object> - <string key="NSWindowContentMaxSize">{292, 112}</string> - <string key="NSWindowContentMinSize">{292, 108}</string> - <object class="NSView" key="NSWindowView" id="1034135752"> - <nil key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="92013996"> - <reference key="NSNextResponder" ref="1034135752"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{17, 76}, {258, 14}}</string> - <reference key="NSSuperview" ref="1034135752"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="315512815"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4195328</int> - <string key="NSContents">Rename database to</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="92013996"/> - <reference key="NSBackgroundColor" ref="62854682"/> - <reference key="NSTextColor" ref="454249633"/> - </object> - </object> - <object class="NSTextField" id="888396188"> - <reference key="NSNextResponder" ref="1034135752"/> - <int key="NSvFlags">258</int> - <string key="NSFrame">{{20, 50}, {252, 18}}</string> - <reference key="NSSuperview" ref="1034135752"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1071800920"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">4326400</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="888396188"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="480189472"/> - <reference key="NSTextColor" ref="690893883"/> - </object> - </object> - <object class="NSButton" id="39894315"> - <reference key="NSNextResponder" ref="1034135752"/> - <int key="NSvFlags">259</int> - <string key="NSFrame">{{207, 13}, {70, 28}}</string> - <reference key="NSSuperview" ref="1034135752"/> - <int key="NSTag">1</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="991476255"> - <int key="NSCellFlags">604110336</int> - <int key="NSCellFlags2">138018816</int> - <string key="NSContents">Rename</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="39894315"/> - <int key="NSTag">1</int> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="932958253"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="681566428"> - <reference key="NSNextResponder" ref="1034135752"/> - <int key="NSvFlags">259</int> - <string key="NSFrame">{{139, 13}, {70, 28}}</string> - <reference key="NSSuperview" ref="1034135752"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="103081067"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">138018816</int> - <string key="NSContents">Cancel</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="681566428"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="932958253"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </object> - <string key="NSFrameSize">{292, 110}</string> - </object> - <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> - <string key="NSMinSize">{292, 130}</string> - <string key="NSMaxSize">{292, 134}</string> - </object> <object class="NSWindowTemplate" id="291331305"> <int key="NSWindowStyleMask">9</int> <int key="NSWindowBacking">2</int> @@ -10299,27 +10060,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSButton" id="38579786"> - <reference key="NSNextResponder" ref="774289419"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{288, 42}, {151, 18}}</string> - <reference key="NSSuperview" ref="774289419"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="273153393"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Compress dump file</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="38579786"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="386686735"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> <object class="NSScrollView" id="27548452"> <reference key="NSNextResponder" ref="774289419"/> <int key="NSvFlags">274</int> @@ -12133,7 +11873,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="NSOnImage" ref="450876295"/> <reference key="NSMixedImage" ref="414351669"/> </object> - <object class="NSMenuItem" id="915784483"> + <object class="NSMenuItem" id="283945119"> <reference key="NSMenu" ref="556141845"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> @@ -12143,7 +11883,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="NSOnImage" ref="450876295"/> <reference key="NSMixedImage" ref="414351669"/> </object> - <object class="NSMenuItem" id="947454058"> + <object class="NSMenuItem" id="201475645"> <reference key="NSMenu" ref="556141845"/> <string key="NSTitle">Show Create Table Syntax...</string> <string key="NSKeyEquiv"/> @@ -12726,6 +12466,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> + <string key="label">databaseNameField</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="839031135"/> + </object> + <int key="connectionID">583</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> <string key="label">databaseSheet</string> <reference key="source" ref="427689665"/> <reference key="destination" ref="554105051"/> @@ -16558,292 +16306,52 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">6921</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">showCreateTableSyntax:</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="947454058"/> - </object> - <int key="connectionID">6925</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">showCreateTableSyntax:</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="570147191"/> - </object> - <int key="connectionID">6928</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">showCreateSyntaxContextMenuItem</string> - <reference key="source" ref="438574515"/> - <reference key="destination" ref="947454058"/> - </object> - <int key="connectionID">6929</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">showCreateSyntaxMenuItem</string> - <reference key="source" ref="438574515"/> - <reference key="destination" ref="570147191"/> - </object> - <int key="connectionID">6930</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">separatorTableMenuItem2</string> <reference key="source" ref="438574515"/> - <reference key="destination" ref="215466732"/> + <reference key="destination" ref="921730788"/> </object> - <int key="connectionID">6931</int> + <int key="connectionID">6923</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">separatorTableContextMenuItem2</string> + <string key="label">showCreateSyntaxMenuItem</string> <reference key="source" ref="438574515"/> - <reference key="destination" ref="915784483"/> - </object> - <int key="connectionID">6932</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">sqlCompressionSwitch</string> - <reference key="source" ref="225526897"/> - <reference key="destination" ref="38579786"/> + <reference key="destination" ref="905049710"/> </object> - <int key="connectionID">6935</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">updateExportCompressionSetting:</string> - <reference key="source" ref="225526897"/> - <reference key="destination" ref="38579786"/> - </object> - <int key="connectionID">6936</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="362774263"/> - <reference key="destination" ref="427689665"/> - </object> - <int key="connectionID">6977</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closePanelSheet:</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="41421287"/> - </object> - <int key="connectionID">6978</int> + <int key="connectionID">6925</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">closePanelSheet:</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="61396236"/> - </object> - <int key="connectionID">6979</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">copyDatabaseButton</string> + <string key="label">showCreateTableSyntax:</string> <reference key="source" ref="427689665"/> - <reference key="destination" ref="61396236"/> + <reference key="destination" ref="905049710"/> </object> - <int key="connectionID">6983</int> + <int key="connectionID">6926</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="560080814"/> - <reference key="destination" ref="41421287"/> - </object> - <int key="connectionID">6988</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="41421287"/> - <reference key="destination" ref="61396236"/> + <string key="label">separatorTableContextMenuItem2</string> + <reference key="source" ref="438574515"/> + <reference key="destination" ref="283945119"/> </object> - <int key="connectionID">6989</int> + <int key="connectionID">6928</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="681566428"/> - <reference key="destination" ref="39894315"/> - </object> - <int key="connectionID">7007</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closePanelSheet:</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="681566428"/> + <string key="label">showCreateSyntaxContextMenuItem</string> + <reference key="source" ref="438574515"/> + <reference key="destination" ref="201475645"/> </object> - <int key="connectionID">7008</int> + <int key="connectionID">6930</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">closePanelSheet:</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="39894315"/> - </object> - <int key="connectionID">7009</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="888396188"/> - <reference key="destination" ref="427689665"/> - </object> - <int key="connectionID">7010</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">renameDatabaseButton</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="39894315"/> - </object> - <int key="connectionID">7011</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">databaseRenameSheet</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="223499819"/> - </object> - <int key="connectionID">7012</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="362774263"/> - <reference key="destination" ref="560080814"/> - </object> - <int key="connectionID">7017</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="888396188"/> - <reference key="destination" ref="681566428"/> - </object> - <int key="connectionID">7019</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="39894315"/> - <reference key="destination" ref="888396188"/> - </object> - <int key="connectionID">7020</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="839031135"/> - <reference key="destination" ref="437431578"/> - </object> - <int key="connectionID">7021</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="437431578"/> - <reference key="destination" ref="681100483"/> - </object> - <int key="connectionID">7022</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="681100483"/> - <reference key="destination" ref="875952722"/> - </object> - <int key="connectionID">7023</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="875952722"/> - <reference key="destination" ref="839031135"/> - </object> - <int key="connectionID">7024</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="61396236"/> - <reference key="destination" ref="362774263"/> - </object> - <int key="connectionID">7026</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">databaseNameField</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="839031135"/> - </object> - <int key="connectionID">7029</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">databaseCopyNameField</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="362774263"/> - </object> - <int key="connectionID">7030</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">databaseRenameNameField</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="888396188"/> - </object> - <int key="connectionID">7031</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">databaseCopySheet</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="1003190366"/> - </object> - <int key="connectionID">7032</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">copyDatabaseDataButton</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="560080814"/> - </object> - <int key="connectionID">7039</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">copyDatabaseMessageField</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="941161511"/> - </object> - <int key="connectionID">7040</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">renameDatabaseMessageField</string> + <string key="label">showCreateTableSyntax:</string> <reference key="source" ref="427689665"/> - <reference key="destination" ref="92013996"/> + <reference key="destination" ref="201475645"/> </object> - <int key="connectionID">7041</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">tableTriggersInstance</string> - <reference key="source" ref="438574515"/> - <reference key="destination" ref="33487092"/> - </object> - <int key="connectionID">7042</int> + <int key="connectionID">6931</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -17366,7 +16874,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference ref="953478607"/> <reference ref="791847552"/> <reference ref="947678838"/> - <reference ref="38579786"/> </object> <reference key="parent" ref="0"/> <string key="objectName">exportDumpView</string> @@ -21527,8 +21034,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference ref="962084508"/> <reference ref="351524538"/> <reference ref="545621807"/> - <reference ref="215466732"/> - <reference ref="570147191"/> + <reference ref="921730788"/> + <reference ref="905049710"/> </object> <reference key="parent" ref="321871356"/> </object> @@ -21614,8 +21121,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference ref="434807053"/> <reference ref="419134079"/> <reference ref="584064012"/> - <reference ref="915784483"/> - <reference ref="947454058"/> + <reference ref="283945119"/> + <reference ref="201475645"/> </object> <reference key="parent" ref="0"/> <string key="objectName">Table List Menu</string> @@ -23481,208 +22988,23 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBObjectRecord"> <int key="objectID">6922</int> - <reference key="object" ref="915784483"/> - <reference key="parent" ref="556141845"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6923</int> - <reference key="object" ref="947454058"/> - <reference key="parent" ref="556141845"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6926</int> - <reference key="object" ref="215466732"/> + <reference key="object" ref="921730788"/> <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6927</int> - <reference key="object" ref="570147191"/> + <int key="objectID">6924</int> + <reference key="object" ref="905049710"/> <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6933</int> - <reference key="object" ref="38579786"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="273153393"/> - </object> - <reference key="parent" ref="774289419"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6934</int> - <reference key="object" ref="273153393"/> - <reference key="parent" ref="38579786"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6937</int> - <reference key="object" ref="1003190366"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="351046403"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Duplicate Database Sheet</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6938</int> - <reference key="object" ref="351046403"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="941161511"/> - <reference ref="362774263"/> - <reference ref="560080814"/> - <reference ref="61396236"/> - <reference ref="41421287"/> - </object> - <reference key="parent" ref="1003190366"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6939</int> - <reference key="object" ref="61396236"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="261586860"/> - </object> - <reference key="parent" ref="351046403"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6942</int> - <reference key="object" ref="941161511"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="292220806"/> - </object> - <reference key="parent" ref="351046403"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6943</int> - <reference key="object" ref="362774263"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="322980098"/> - </object> - <reference key="parent" ref="351046403"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6944</int> - <reference key="object" ref="41421287"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1011860722"/> - </object> - <reference key="parent" ref="351046403"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6945</int> - <reference key="object" ref="1011860722"/> - <reference key="parent" ref="41421287"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6946</int> - <reference key="object" ref="322980098"/> - <reference key="parent" ref="362774263"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6947</int> - <reference key="object" ref="292220806"/> - <reference key="parent" ref="941161511"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6976</int> - <reference key="object" ref="261586860"/> - <reference key="parent" ref="61396236"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6980</int> - <reference key="object" ref="560080814"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="852298622"/> - </object> - <reference key="parent" ref="351046403"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6981</int> - <reference key="object" ref="852298622"/> - <reference key="parent" ref="560080814"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6990</int> - <reference key="object" ref="223499819"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1034135752"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Rename Database Sheet</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6991</int> - <reference key="object" ref="1034135752"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="39894315"/> - <reference ref="92013996"/> - <reference ref="888396188"/> - <reference ref="681566428"/> - </object> - <reference key="parent" ref="223499819"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6993</int> - <reference key="object" ref="681566428"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="103081067"/> - </object> - <reference key="parent" ref="1034135752"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6994</int> - <reference key="object" ref="888396188"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1071800920"/> - </object> - <reference key="parent" ref="1034135752"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6995</int> - <reference key="object" ref="92013996"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="315512815"/> - </object> - <reference key="parent" ref="1034135752"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6997</int> - <reference key="object" ref="39894315"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="991476255"/> - </object> - <reference key="parent" ref="1034135752"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6998</int> - <reference key="object" ref="991476255"/> - <reference key="parent" ref="39894315"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7000</int> - <reference key="object" ref="315512815"/> - <reference key="parent" ref="92013996"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7001</int> - <reference key="object" ref="1071800920"/> - <reference key="parent" ref="888396188"/> + <int key="objectID">6927</int> + <reference key="object" ref="283945119"/> + <reference key="parent" ref="556141845"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7002</int> - <reference key="object" ref="103081067"/> - <reference key="parent" ref="681566428"/> + <int key="objectID">6929</int> + <reference key="object" ref="201475645"/> + <reference key="parent" ref="556141845"/> </object> </object> </object> @@ -24243,6 +23565,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>4795.IBPluginDependency</string> <string>5.IBEditorWindowLastContentRect</string> <string>5.IBPluginDependency</string> + <string>5.IBViewEditorWindowController.showingBoundsRectangles</string> <string>5.IBViewEditorWindowController.showingLayoutRectangles</string> <string>5.IBWindowTemplateEditedContentRect</string> <string>5.ImportedFromIB2</string> @@ -25070,59 +24393,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>6916.IBPluginDependency</string> <string>6917.IBPluginDependency</string> <string>6922.IBPluginDependency</string> - <string>6923.IBPluginDependency</string> - <string>6926.IBPluginDependency</string> + <string>6924.IBPluginDependency</string> <string>6927.IBPluginDependency</string> - <string>6933.IBAttributePlaceholdersKey</string> - <string>6933.IBPluginDependency</string> - <string>6933.ImportedFromIB2</string> - <string>6934.IBPluginDependency</string> - <string>6937.IBEditorWindowLastContentRect</string> - <string>6937.IBPluginDependency</string> - <string>6937.IBWindowTemplateEditedContentRect</string> - <string>6937.ImportedFromIB2</string> - <string>6937.windowTemplate.hasMaxSize</string> - <string>6937.windowTemplate.hasMinSize</string> - <string>6937.windowTemplate.maxSize</string> - <string>6937.windowTemplate.minSize</string> - <string>6938.IBPluginDependency</string> - <string>6938.ImportedFromIB2</string> - <string>6939.IBPluginDependency</string> - <string>6939.ImportedFromIB2</string> - <string>6942.IBPluginDependency</string> - <string>6942.ImportedFromIB2</string> - <string>6943.IBPluginDependency</string> - <string>6943.ImportedFromIB2</string> - <string>6944.IBPluginDependency</string> - <string>6944.ImportedFromIB2</string> - <string>6945.IBPluginDependency</string> - <string>6946.IBPluginDependency</string> - <string>6947.IBPluginDependency</string> - <string>6976.IBPluginDependency</string> - <string>6980.IBPluginDependency</string> - <string>6981.IBPluginDependency</string> - <string>6990.IBEditorWindowLastContentRect</string> - <string>6990.IBPluginDependency</string> - <string>6990.IBWindowTemplateEditedContentRect</string> - <string>6990.ImportedFromIB2</string> - <string>6990.windowTemplate.hasMaxSize</string> - <string>6990.windowTemplate.hasMinSize</string> - <string>6990.windowTemplate.maxSize</string> - <string>6990.windowTemplate.minSize</string> - <string>6991.IBPluginDependency</string> - <string>6991.ImportedFromIB2</string> - <string>6993.IBPluginDependency</string> - <string>6993.ImportedFromIB2</string> - <string>6994.IBPluginDependency</string> - <string>6994.ImportedFromIB2</string> - <string>6995.IBPluginDependency</string> - <string>6995.ImportedFromIB2</string> - <string>6997.IBPluginDependency</string> - <string>6997.ImportedFromIB2</string> - <string>6998.IBPluginDependency</string> - <string>7000.IBPluginDependency</string> - <string>7001.IBPluginDependency</string> - <string>7002.IBPluginDependency</string> + <string>6929.IBPluginDependency</string> <string>711.IBPluginDependency</string> <string>711.ImportedFromIB2</string> <string>713.IBPluginDependency</string> @@ -25932,10 +25205,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{54, 206}, {944, 550}}</string> + <string>{{77, 206}, {944, 550}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> <boolean value="NO"/> - <string>{{54, 206}, {944, 550}}</string> + <string>{{77, 206}, {944, 550}}</string> <integer value="1"/> <integer value="1"/> <string>{{62, 352}, {845, 504}}</string> @@ -25945,9 +25219,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>{780, 480}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{940, 346}, {260, 127}}</string> + <string>{{628, 485}, {260, 127}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{940, 346}, {260, 127}}</string> + <string>{{628, 485}, {260, 127}}</string> <integer value="1"/> <boolean value="YES"/> <integer value="1"/> @@ -26135,9 +25409,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{919, 382}, {269, 142}}</string> + <string>{{630, 405}, {269, 142}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{919, 382}, {269, 142}}</string> + <string>{{630, 405}, {269, 142}}</string> <integer value="1"/> <boolean value="YES"/> <boolean value="YES"/> @@ -26377,9 +25651,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{859, 372}, {292, 112}}</string> + <string>{{456, 425}, {292, 112}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{859, 372}, {292, 112}}</string> + <string>{{456, 425}, {292, 112}}</string> <integer value="1"/> <integer value="1"/> <integer value="1"/> @@ -26528,7 +25802,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> - <string>{{73, 104}, {208, 125}}</string> + <string>{{96, 104}, {208, 125}}</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> <object class="NSMutableDictionary"> @@ -26590,7 +25864,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> - <string>{{774, 479}, {241, 123}}</string> + <string>{{623, 367}, {241, 123}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -26636,7 +25910,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>{{735, 570}, {233, 53}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{926, 501}, {228, 113}}</string> + <string>{{774, 501}, {228, 113}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -27128,63 +26402,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="38579786"/> - <string key="toolTip">Automatically compress the exported file using Gzip compression</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{710, 531}, {292, 132}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{710, 531}, {292, 132}}</string> - <integer value="1"/> - <integer value="1"/> - <integer value="1"/> - <string>{292, 132}</string> - <string>{292, 132}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{919, 473}, {292, 110}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{919, 473}, {292, 110}}</string> - <integer value="1"/> - <integer value="1"/> - <integer value="1"/> - <string>{292, 112}</string> - <string>{292, 108}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -27211,7 +26428,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{193, 565}, {457, 191}}</string> + <string>{{193, 665}, {457, 191}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -27328,7 +26545,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <nil key="sourceID"/> - <int key="maxID">7042</int> + <int key="maxID">6931</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -28376,7 +27593,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>copyChecksumFromSheet:</string> <string>copyCreateTableSyntax:</string> <string>copyCreateTableSyntaxFromSheet:</string> - <string>copyDatabase:</string> <string>export:</string> <string>exportMultipleTables:</string> <string>exportTable:</string> @@ -28385,11 +27601,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>focusOnTableContentFilter:</string> <string>focusOnTableListFilter:</string> <string>import:</string> - <string>importFromClipboard:</string> <string>openCurrentConnectionInNewWindow:</string> <string>optimizeTable:</string> <string>removeDatabase:</string> - <string>renameDatabase:</string> <string>repairTable:</string> <string>saveConnectionSheet:</string> <string>saveCreateSyntax:</string> @@ -28457,9 +27671,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -28470,21 +27681,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>chooseDatabaseButton</string> <string>connectionErrorDialog</string> <string>contentViewSplitter</string> - <string>copyDatabaseButton</string> - <string>copyDatabaseDataButton</string> - <string>copyDatabaseMessageField</string> <string>createTableSyntaxTextField</string> <string>createTableSyntaxTextView</string> <string>createTableSyntaxWindow</string> <string>customQueryInstance</string> <string>customQueryTextView</string> - <string>databaseCopyNameField</string> - <string>databaseCopySheet</string> <string>databaseDataInstance</string> <string>databaseEncodingButton</string> <string>databaseNameField</string> - <string>databaseRenameNameField</string> - <string>databaseRenameSheet</string> <string>databaseSheet</string> <string>dbTablesTableView</string> <string>encodingPopUp</string> @@ -28498,8 +27702,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>inputTextWindowSecureTextField</string> <string>listFilterField</string> <string>queryProgressBar</string> - <string>renameDatabaseButton</string> - <string>renameDatabaseMessageField</string> <string>saveConnectionAccessory</string> <string>saveConnectionAutoConnect</string> <string>saveConnectionEncrypt</string> @@ -28542,9 +27744,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>NSWindow</string> <string>NSSplitView</string> - <string>id</string> - <string>id</string> - <string>id</string> <string>NSTextField</string> <string>NSTextView</string> <string>NSWindow</string> @@ -28554,10 +27753,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> <string>NSTableView</string> <string>NSPopUpButton</string> <string>id</string> @@ -28573,8 +27768,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> <string>NSSecureTextField</string> <string>id</string> <string>id</string> @@ -28596,7 +27789,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>NSTabView</string> <string>id</string> - <string>NSWindow</string> + <string>id</string> <string>id</string> <string>NSButton</string> <string>id</string> @@ -28637,7 +27830,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>selectTables:</string> <string>switchInput:</string> <string>switchTab:</string> - <string>updateExportCompressionSetting:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -28649,7 +27841,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -28693,9 +27884,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>importFieldsEscapedField</string> <string>importFieldsTerminatedField</string> <string>importFormatPopup</string> - <string>importFromClipboardAccessoryView</string> - <string>importFromClipboardSheet</string> - <string>importFromClipboardTextView</string> <string>importLinesTerminatedField</string> <string>multiCSVFullStreamingSwitch</string> <string>multiXMLFullStreamingSwitch</string> @@ -28703,7 +27891,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>singleProgressSheet</string> <string>singleProgressText</string> <string>singleProgressTitle</string> - <string>sqlCompressionSwitch</string> <string>sqlFullStreamingSwitch</string> <string>tableContentInstance</string> <string>tableDataInstance</string> @@ -28753,10 +27940,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>NSPopUpButton</string> <string>id</string> <string>id</string> - <string>NSTextView</string> - <string>id</string> - <string>id</string> - <string>id</string> <string>id</string> <string>id</string> <string>id</string> @@ -28960,7 +28143,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>tableNameField</string> <string>tableSheet</string> <string>tableSourceInstance</string> - <string>tableTriggersInstance</string> <string>tableTypeButton</string> <string>tableWindow</string> <string>tablesListView</string> @@ -29016,7 +28198,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <reference key="sourceIdentifier" ref="197237725"/> @@ -29101,57 +28282,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSActionCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="184700074"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="984878276"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="439307784"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSApplication</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -29159,439 +28289,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSArrayController</string> - <string key="superclassName">NSObjectController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSArrayController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSBox</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSBox.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButton</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButtonCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSCell</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSComboBox</string> - <string key="superclassName">NSTextField</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSComboBox.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSComboBoxCell</string> - <string key="superclassName">NSTextFieldCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSComboBoxCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1044894641"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSController</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDictionary</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="424947834"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSDictionary.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDictionary</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="457038916"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDictionary</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="299226340"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDocument</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>printDocument:</string> - <string>revertDocumentToSaved:</string> - <string>runPageLayout:</string> - <string>saveDocument:</string> - <string>saveDocumentAs:</string> - <string>saveDocumentTo:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDocument.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDocument</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDocumentScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSImageCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSImageCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSImageView</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSImageView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="68662337"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="894161546"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItemCell</string> - <string key="superclassName">NSButtonCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMutableDictionary</string> - <string key="superclassName">NSDictionary</string> - <reference key="sourceIdentifier" ref="424947834"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMutableDictionary</string> - <reference key="sourceIdentifier" ref="299226340"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSNumberFormatter</string> - <string key="superclassName">NSFormatter</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSNumberFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="184700074"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="984878276"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="439307784"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="1044894641"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="68662337"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="685326671"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="408452782"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="559681503"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSError.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="457038916"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="299226340"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -29613,321 +28310,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebDownload.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebEditingDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebFrameLoadDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebJavaPlugIn.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPlugin.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPluginContainer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPolicyDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebResourceLoadDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebScriptObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebUIDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObjectController</string> - <string key="superclassName">NSController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSObjectController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSOutlineView</string> - <string key="superclassName">NSTableView</string> - <reference key="sourceIdentifier" ref="685326671"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSPanel</string> - <string key="superclassName">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSPopUpButton</string> - <string key="superclassName">NSButton</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSPopUpButtonCell</string> - <string key="superclassName">NSMenuItemCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSProgressIndicator</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSProgressIndicator.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSScrollView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSScroller</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSScroller.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSearchField</string> - <string key="superclassName">NSTextField</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSearchField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSearchFieldCell</string> - <string key="superclassName">NSTextFieldCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSearchFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSecureTextField</string> - <string key="superclassName">NSTextField</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="308813593"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSecureTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSecureTextFieldCell</string> - <string key="superclassName">NSTextFieldCell</string> - <reference key="sourceIdentifier" ref="308813593"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSegmentedCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSegmentedCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSegmentedControl</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSegmentedControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSplitView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSStepper</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSStepper.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTabView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTabView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTabViewItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTabViewItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTableColumn</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTableColumn.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTableHeaderView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTableHeaderView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTableView</string> - <string key="superclassName">NSControl</string> - <reference key="sourceIdentifier" ref="408452782"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSText</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSText.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextField</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextFieldCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextView</string> - <string key="superclassName">NSText</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTreeController</string> - <string key="superclassName">NSObjectController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTreeController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSUserDefaultsController</string> - <string key="superclassName">NSController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <reference key="sourceIdentifier" ref="894161546"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="559681503"/> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -29938,86 +28320,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="className">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h</string> </object> </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindowController</string> - <string key="superclassName">NSResponder</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showWindow:</string> - <string key="NS.object.0">id</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">WebView</string> - <string key="superclassName">NSView</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>goBack:</string> - <string>goForward:</string> - <string>makeTextLarger:</string> - <string>makeTextSmaller:</string> - <string>makeTextStandardSize:</string> - <string>reload:</string> - <string>reloadFromOrigin:</string> - <string>stopLoading:</string> - <string>takeStringURLFrom:</string> - <string>toggleContinuousSpellChecking:</string> - <string>toggleSmartInsertDelete:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebView.h</string> - </object> - </object> </object> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -30033,74 +28341,5 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSActionTemplate</string> - <string>NSAddTemplate</string> - <string>NSAdvanced</string> - <string>NSApplicationIcon</string> - <string>NSGoLeftTemplate</string> - <string>NSGoRightTemplate</string> - <string>NSLeftFacingTriangleTemplate</string> - <string>NSListViewTemplate</string> - <string>NSMenuCheckmark</string> - <string>NSMenuMixedState</string> - <string>NSRefreshTemplate</string> - <string>NSRightFacingTriangleTemplate</string> - <string>NSSwitch</string> - <string>button_action</string> - <string>button_add</string> - <string>button_bar_spacer</string> - <string>button_duplicate</string> - <string>button_edit</string> - <string>button_edit_mode</string> - <string>button_edit_mode_selected</string> - <string>button_left</string> - <string>button_pagination</string> - <string>button_pane_hide_icon</string> - <string>button_pane_show_icon</string> - <string>button_refresh</string> - <string>button_remove</string> - <string>button_right</string> - <string>grabber-horizontal</string> - <string>selectall</string> - <string>selectnone</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{10, 10}</string> - <string>{8, 8}</string> - <string>{32, 32}</string> - <string>{128, 128}</string> - <string>{9, 9}</string> - <string>{9, 9}</string> - <string>{9, 9}</string> - <string>{11, 10}</string> - <string>{9, 8}</string> - <string>{7, 2}</string> - <string>{10, 12}</string> - <string>{9, 9}</string> - <string>{15, 15}</string> - <string>{32, 23}</string> - <string>{32, 23}</string> - <string>{10, 23}</string> - <string>{33, 23}</string> - <string>{32, 23}</string> - <string>{32, 23}</string> - <string>{32, 23}</string> - <string>{32, 23}</string> - <string>{32, 23}</string> - <string>{11, 10}</string> - <string>{11, 10}</string> - <string>{32, 23}</string> - <string>{32, 23}</string> - <string>{32, 23}</string> - <string>{10, 8}</string> - <string>{14, 17}</string> - <string>{14, 17}</string> - </object> - </object> </data> </archive> diff --git a/Interfaces/English.lproj/DatabaseProcessList.xib b/Interfaces/English.lproj/DatabaseProcessList.xib index d4129c44..74bb98b4 100644 --- a/Interfaces/English.lproj/DatabaseProcessList.xib +++ b/Interfaces/English.lproj/DatabaseProcessList.xib @@ -2,18 +2,17 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10D573</string> - <string key="IBDocument.InterfaceBuilderVersion">762</string> - <string key="IBDocument.AppKitVersion">1038.29</string> - <string key="IBDocument.HIToolboxVersion">460.00</string> + <string key="IBDocument.SystemVersion">10C540</string> + <string key="IBDocument.InterfaceBuilderVersion">740</string> + <string key="IBDocument.AppKitVersion">1038.25</string> + <string key="IBDocument.HIToolboxVersion">458.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">762</string> + <string key="NS.object.0">740</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="134"/> - <integer value="69"/> + <integer value="7"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -357,7 +356,6 @@ </object> <string key="NSFrame">{{1, 17}, {575, 130}}</string> <reference key="NSSuperview" ref="859424053"/> - <reference key="NSNextKeyView" ref="457137758"/> <reference key="NSDocView" ref="457137758"/> <reference key="NSBGColor" ref="657889635"/> <int key="NScvFlags">4</int> @@ -391,7 +389,6 @@ </object> <string key="NSFrame">{{1, 0}, {575, 17}}</string> <reference key="NSSuperview" ref="859424053"/> - <reference key="NSNextKeyView" ref="442504499"/> <reference key="NSDocView" ref="442504499"/> <reference key="NSBGColor" ref="657889635"/> <int key="NScvFlags">4</int> @@ -400,7 +397,6 @@ </object> <string key="NSFrame">{{-1, 22}, {577, 148}}</string> <reference key="NSSuperview" ref="1010674838"/> - <reference key="NSNextKeyView" ref="605698422"/> <int key="NSsFlags">530</int> <reference key="NSVScroller" ref="971927666"/> <reference key="NSHScroller" ref="287987975"/> @@ -424,7 +420,7 @@ <reference key="NSControlView" ref="872678477"/> <bool key="NSDrawsBackground">YES</bool> <int key="NSTextBezelStyle">1</int> - <object class="NSColor" key="NSBackgroundColor" id="16424670"> + <object class="NSColor" key="NSBackgroundColor"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">textBackgroundColor</string> @@ -479,9 +475,9 @@ </object> <object class="NSProgressIndicator" id="456564741"> <reference key="NSNextResponder" ref="1010674838"/> - <int key="NSvFlags">-2147482359</int> + <int key="NSvFlags">-2147482356</int> <object class="NSPSMatrix" key="NSDrawMatrix"/> - <string key="NSFrame">{{548, 178}, {16, 16}}</string> + <string key="NSFrame">{{559, 178}, {16, 16}}</string> <reference key="NSSuperview" ref="1010674838"/> <int key="NSpiFlags">20746</int> <double key="NSMaxValue">100</double> @@ -620,113 +616,20 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="627053027"/> </object> - <object class="NSMenuItem" id="987382219"> + <object class="NSMenuItem" id="842507213"> <reference key="NSMenu" ref="985642956"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> + <string key="NSTitle">Show FULL Process List</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> <reference key="NSOnImage" ref="895795572"/> <reference key="NSMixedImage" ref="112300578"/> <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="627053027"/> </object> - <object class="NSMenuItem" id="437163950"> - <reference key="NSMenu" ref="985642956"/> - <string key="NSTitle">Auto Refresh Interval</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="895795572"/> - <reference key="NSMixedImage" ref="112300578"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="72921066"> - <string key="NSTitle">Auto Refresh Interval</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="595944963"> - <reference key="NSMenu" ref="72921066"/> - <string key="NSTitle">2 Seconds</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="895795572"/> - <reference key="NSMixedImage" ref="112300578"/> - <string key="NSAction">_popUpItemAction:</string> - <int key="NSTag">2</int> - <reference key="NSTarget" ref="627053027"/> - </object> - <object class="NSMenuItem" id="58356064"> - <reference key="NSMenu" ref="72921066"/> - <string key="NSTitle">5 Seconds</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="895795572"/> - <reference key="NSMixedImage" ref="112300578"/> - <string key="NSAction">_popUpItemAction:</string> - <int key="NSTag">5</int> - <reference key="NSTarget" ref="627053027"/> - </object> - <object class="NSMenuItem" id="112724365"> - <reference key="NSMenu" ref="72921066"/> - <string key="NSTitle">10 Seconds</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="895795572"/> - <reference key="NSMixedImage" ref="112300578"/> - <string key="NSAction">_popUpItemAction:</string> - <int key="NSTag">10</int> - <reference key="NSTarget" ref="627053027"/> - </object> - <object class="NSMenuItem" id="554038186"> - <reference key="NSMenu" ref="72921066"/> - <string key="NSTitle">30 Seconds</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="895795572"/> - <reference key="NSMixedImage" ref="112300578"/> - <string key="NSAction">_popUpItemAction:</string> - <int key="NSTag">30</int> - <reference key="NSTarget" ref="627053027"/> - </object> - <object class="NSMenuItem" id="173420401"> - <reference key="NSMenu" ref="72921066"/> - <string key="NSTitle">60 Seconds</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="895795572"/> - <reference key="NSMixedImage" ref="112300578"/> - <string key="NSAction">_popUpItemAction:</string> - <int key="NSTag">60</int> - <reference key="NSTarget" ref="627053027"/> - </object> - <object class="NSMenuItem" id="99082973"> - <reference key="NSMenu" ref="72921066"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="895795572"/> - <reference key="NSMixedImage" ref="112300578"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="627053027"/> - </object> - <object class="NSMenuItem" id="875169045"> - <reference key="NSMenu" ref="72921066"/> - <string key="NSTitle">Custom...</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="895795572"/> - <reference key="NSMixedImage" ref="112300578"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="627053027"/> - </object> - </object> - </object> - </object> </object> </object> - <int key="NSSelectedIndex">3</int> + <int key="NSSelectedIndex">2</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -736,16 +639,16 @@ <object class="NSTextField" id="695408953"> <reference key="NSNextResponder" ref="1010674838"/> <int key="NSvFlags">-2147483358</int> - <string key="NSFrame">{{159, 4}, {282, 14}}</string> + <string key="NSFrame">{{67, 4}, {374, 14}}</string> <reference key="NSSuperview" ref="1010674838"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="717069845"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71435264</int> + <int key="NSCellFlags2">272761856</int> <string key="NSContents">0 of 0</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="695408953"/> - <object class="NSColor" key="NSBackgroundColor" id="93742750"> + <object class="NSColor" key="NSBackgroundColor"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">controlColor</string> @@ -754,33 +657,6 @@ <reference key="NSTextColor" ref="37591332"/> </object> </object> - <object class="NSButton" id="490566722"> - <reference key="NSNextResponder" ref="1010674838"/> - <int key="NSvFlags">288</int> - <string key="NSFrame">{{67, 2}, {89, 18}}</string> - <reference key="NSSuperview" ref="1010674838"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="854934607"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Auto refresh</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="490566722"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSSwitch</string> - </object> - <object class="NSButtonImageSource" key="NSAlternateImage"> - <string key="NSImageName">NSSwitch</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> </object> <string key="NSFrameSize">{575, 203}</string> <reference key="NSSuperview"/> @@ -830,202 +706,12 @@ </object> </object> <object class="NSUserDefaultsController" id="280475776"> - <bool key="NSSharedInstance">YES</bool> - </object> - <object class="NSWindowTemplate" id="237958724"> - <int key="NSWindowStyleMask">1</int> - <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{343, 502}, {189, 93}}</string> - <int key="NSWTFlags">1886912512</int> - <string key="NSWindowTitle">Custom Interval</string> - <string key="NSWindowClass">NSWindow</string> - <object class="NSMutableString" key="NSViewClass"> - <characters key="NS.bytes">View</characters> - </object> - <string key="NSWindowContentMaxSize">{292, 112}</string> - <string key="NSWindowContentMinSize">{189, 93}</string> - <object class="NSView" key="NSWindowView" id="123987262"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="93578059"> - <reference key="NSNextResponder" ref="123987262"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{17, 56}, {48, 14}}</string> - <reference key="NSSuperview" ref="123987262"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="582871149"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Interval:</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="93578059"/> - <reference key="NSBackgroundColor" ref="93742750"/> - <reference key="NSTextColor" ref="37591332"/> - </object> - </object> - <object class="NSTextField" id="287497744"> - <reference key="NSNextResponder" ref="123987262"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{124, 56}, {48, 14}}</string> - <reference key="NSSuperview" ref="123987262"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="514749158"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4195328</int> - <string key="NSContents">seconds</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="287497744"/> - <reference key="NSBackgroundColor" ref="93742750"/> - <reference key="NSTextColor" ref="37591332"/> - </object> - </object> - <object class="NSButton" id="1030049816"> - <reference key="NSNextResponder" ref="123987262"/> - <int key="NSvFlags">259</int> - <string key="NSFrame">{{94, 13}, {70, 28}}</string> - <reference key="NSSuperview" ref="123987262"/> - <int key="NSTag">1</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="255352692"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">138018816</int> - <string key="NSContents">OK</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="1030049816"/> - <int key="NSTag">1</int> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <object class="NSFont" key="NSAlternateImage" id="698140750"> - <string key="NSName">Helvetica</string> - <double key="NSSize">11</double> - <int key="NSfFlags">16</int> - </object> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="966616599"> - <reference key="NSNextResponder" ref="123987262"/> - <int key="NSvFlags">259</int> - <string key="NSFrame">{{26, 13}, {70, 28}}</string> - <reference key="NSSuperview" ref="123987262"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="857419907"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">138018816</int> - <string key="NSContents">Cancel</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="966616599"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="698140750"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSTextField" id="680776"> - <reference key="NSNextResponder" ref="123987262"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{70, 52}, {49, 22}}</string> - <reference key="NSSuperview" ref="123987262"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="437242737"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272630784</int> - <reference key="NSSupport" ref="421083426"/> - <object class="NSNumberFormatter" key="NSFormatter" id="59013685"> - <object class="NSMutableDictionary" key="NS.attributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>allowsFloats</string> - <string>formatterBehavior</string> - <string>lenient</string> - <string>locale</string> - <string>minimum</string> - <string>negativeInfinitySymbol</string> - <string>nilSymbol</string> - <string>numberStyle</string> - <string>positiveInfinitySymbol</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <boolean value="YES"/> - <integer value="1040"/> - <boolean value="NO"/> - <object class="NSLocale"> - <string key="NS.identifier"/> - </object> - <real value="1"/> - <string>-∞</string> - <string/> - <integer value="1"/> - <string>+∞</string> - </object> - </object> - <string key="NS.positiveformat">#,##0.###</string> - <string key="NS.negativeformat">#,##0.###</string> - <nil key="NS.positiveattrs"/> - <nil key="NS.negativeattrs"/> - <nil key="NS.zero"/> - <object class="NSAttributedString" key="NS.nil"> - <string key="NSString"/> - </object> - <object class="NSAttributedString" key="NS.nan"> - <string key="NSString">NaN</string> - <object class="NSDictionary" key="NSAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - </object> - <real value="1" key="NS.min"/> - <object class="NSDecimalNumberPlaceholder" key="NS.max"> - <int key="NS.exponent">0</int> - <int key="NS.length">0</int> - <bool key="NS.negative">YES</bool> - <bool key="NS.compact">NO</bool> - <int key="NS.mantissa.bo">1</int> - <bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes> - </object> - <object class="NSDecimalNumberHandler" key="NS.rounding"> - <int key="NS.roundingmode">3</int> - <bool key="NS.raise.overflow">YES</bool> - <bool key="NS.raise.underflow">YES</bool> - <bool key="NS.raise.dividebyzero">YES</bool> - </object> - <string key="NS.decimal">.</string> - <string key="NS.thousand">,</string> - <bool key="NS.hasthousands">YES</bool> - <bool key="NS.localized">NO</bool> - <bool key="NS.allowsfloats">YES</bool> - </object> - <reference key="NSControlView" ref="680776"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="16424670"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textColor</string> - <reference key="NSColor" ref="346953463"/> - </object> - </object> - </object> - </object> - <string key="NSFrameSize">{189, 93}</string> - <reference key="NSSuperview"/> + <object class="NSMutableArray" key="NSDeclaredKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>ProcessListShowProcessID</string> + <string>ProcessListShowFullProcessList</string> </object> - <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> - <string key="NSMinSize">{189, 115}</string> - <string key="NSMaxSize">{292, 134}</string> + <bool key="NSSharedInstance">YES</bool> </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -1197,147 +883,31 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">toggleProcessListAutoRefresh:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="490566722"/> - </object> - <int key="connectionID">107</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">autoRefreshButton</string> + <string key="label">toggeleShowFullProcessList:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="490566722"/> + <reference key="destination" ref="842507213"/> </object> - <int key="connectionID">108</int> + <int key="connectionID">101</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.ProcessListEnableAutoRefresh</string> - <reference key="source" ref="490566722"/> + <string key="label">value: values.ProcessListShowFullProcessList</string> + <reference key="source" ref="842507213"/> <reference key="destination" ref="280475776"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="490566722"/> + <reference key="NSSource" ref="842507213"/> <reference key="NSDestination" ref="280475776"/> - <string key="NSLabel">value: values.ProcessListEnableAutoRefresh</string> + <string key="NSLabel">value: values.ProcessListShowFullProcessList</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.ProcessListEnableAutoRefresh</string> + <string key="NSKeyPath">values.ProcessListShowFullProcessList</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSConditionallySetsEnabled</string> + <boolean value="NO" key="NS.object.0"/> + </object> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">110</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="1071072595"/> - <reference key="destination" ref="1001"/> - </object> - <int key="connectionID">111</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">setAutoRefreshInterval:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="595944963"/> - </object> - <int key="connectionID">123</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">setAutoRefreshInterval:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="58356064"/> - </object> - <int key="connectionID">124</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">setCustomAutoRefreshInterval:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="875169045"/> - </object> - <int key="connectionID">128</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">setAutoRefreshInterval:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="112724365"/> - </object> - <int key="connectionID">129</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">setAutoRefreshInterval:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="554038186"/> - </object> - <int key="connectionID">130</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">setAutoRefreshInterval:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="173420401"/> - </object> - <int key="connectionID">131</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">autoRefreshIntervalMenuItem</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="437163950"/> - </object> - <int key="connectionID">132</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">customIntervalWindow</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="237958724"/> - </object> - <int key="connectionID">179</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">customIntervalButton</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="1030049816"/> - </object> - <int key="connectionID">180</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="680776"/> - <reference key="destination" ref="1001"/> - </object> - <int key="connectionID">182</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">customIntervalTextField</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="680776"/> - </object> - <int key="connectionID">183</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closeSheet:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="966616599"/> - </object> - <int key="connectionID">184</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closeSheet:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="1030049816"/> - </object> - <int key="connectionID">185</int> + <int key="connectionID">104</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -1390,7 +960,6 @@ <reference ref="602221387"/> <reference ref="215740769"/> <reference ref="695408953"/> - <reference ref="490566722"/> </object> <reference key="parent" ref="1071072595"/> </object> @@ -1642,14 +1211,18 @@ <reference key="object" ref="985642956"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="842507213"/> <reference ref="915308397"/> <reference ref="197497844"/> - <reference ref="987382219"/> - <reference ref="437163950"/> </object> <reference key="parent" ref="627053027"/> </object> <object class="IBObjectRecord"> + <int key="objectID">79</int> + <reference key="object" ref="842507213"/> + <reference key="parent" ref="985642956"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">82</int> <reference key="object" ref="915308397"/> <reference key="parent" ref="985642956"/> @@ -1702,186 +1275,6 @@ <reference key="object" ref="280475776"/> <reference key="parent" ref="0"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">105</int> - <reference key="object" ref="490566722"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="854934607"/> - </object> - <reference key="parent" ref="1010674838"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">106</int> - <reference key="object" ref="854934607"/> - <reference key="parent" ref="490566722"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">112</int> - <reference key="object" ref="987382219"/> - <reference key="parent" ref="985642956"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">113</int> - <reference key="object" ref="437163950"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="72921066"/> - </object> - <reference key="parent" ref="985642956"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">114</int> - <reference key="object" ref="72921066"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="595944963"/> - <reference ref="58356064"/> - <reference ref="112724365"/> - <reference ref="554038186"/> - <reference ref="173420401"/> - <reference ref="875169045"/> - <reference ref="99082973"/> - </object> - <reference key="parent" ref="437163950"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">115</int> - <reference key="object" ref="595944963"/> - <reference key="parent" ref="72921066"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">116</int> - <reference key="object" ref="58356064"/> - <reference key="parent" ref="72921066"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">117</int> - <reference key="object" ref="112724365"/> - <reference key="parent" ref="72921066"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">118</int> - <reference key="object" ref="554038186"/> - <reference key="parent" ref="72921066"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">119</int> - <reference key="object" ref="173420401"/> - <reference key="parent" ref="72921066"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">120</int> - <reference key="object" ref="99082973"/> - <reference key="parent" ref="72921066"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">121</int> - <reference key="object" ref="875169045"/> - <reference key="parent" ref="72921066"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">133</int> - <reference key="object" ref="237958724"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="123987262"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Custom Interval</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">134</int> - <reference key="object" ref="123987262"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="93578059"/> - <reference ref="287497744"/> - <reference ref="680776"/> - <reference ref="1030049816"/> - <reference ref="966616599"/> - </object> - <reference key="parent" ref="237958724"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">135</int> - <reference key="object" ref="1030049816"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="255352692"/> - </object> - <reference key="parent" ref="123987262"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">138</int> - <reference key="object" ref="93578059"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="582871149"/> - </object> - <reference key="parent" ref="123987262"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">140</int> - <reference key="object" ref="966616599"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="857419907"/> - </object> - <reference key="parent" ref="123987262"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">141</int> - <reference key="object" ref="857419907"/> - <reference key="parent" ref="966616599"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">143</int> - <reference key="object" ref="582871149"/> - <reference key="parent" ref="93578059"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">172</int> - <reference key="object" ref="255352692"/> - <reference key="parent" ref="1030049816"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">173</int> - <reference key="object" ref="287497744"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="514749158"/> - </object> - <reference key="parent" ref="123987262"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">174</int> - <reference key="object" ref="514749158"/> - <reference key="parent" ref="287497744"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">176</int> - <reference key="object" ref="680776"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="437242737"/> - </object> - <reference key="parent" ref="123987262"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">177</int> - <reference key="object" ref="437242737"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="59013685"/> - </object> - <reference key="parent" ref="680776"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">178</int> - <reference key="object" ref="59013685"/> - <reference key="parent" ref="437242737"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1889,55 +1282,14 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>-3.IBPluginDependency</string> - <string>105.IBPluginDependency</string> - <string>106.IBPluginDependency</string> - <string>112.IBPluginDependency</string> - <string>113.IBPluginDependency</string> - <string>114.IBEditorWindowLastContentRect</string> - <string>114.IBPluginDependency</string> - <string>115.IBPluginDependency</string> - <string>116.IBPluginDependency</string> - <string>117.IBPluginDependency</string> - <string>118.IBPluginDependency</string> - <string>119.IBPluginDependency</string> - <string>120.IBPluginDependency</string> - <string>121.IBPluginDependency</string> - <string>133.IBEditorWindowLastContentRect</string> - <string>133.IBPluginDependency</string> - <string>133.IBWindowTemplateEditedContentRect</string> - <string>133.ImportedFromIB2</string> - <string>133.windowTemplate.hasMaxSize</string> - <string>133.windowTemplate.hasMinSize</string> - <string>133.windowTemplate.maxSize</string> - <string>133.windowTemplate.minSize</string> - <string>134.IBPluginDependency</string> - <string>134.ImportedFromIB2</string> - <string>135.IBPluginDependency</string> - <string>135.ImportedFromIB2</string> - <string>138.IBPluginDependency</string> - <string>138.ImportedFromIB2</string> <string>14.IBPluginDependency</string> <string>14.IBShouldRemoveOnLegacySave</string> - <string>140.IBPluginDependency</string> - <string>140.ImportedFromIB2</string> - <string>141.IBPluginDependency</string> - <string>143.IBPluginDependency</string> <string>15.IBPluginDependency</string> <string>15.IBShouldRemoveOnLegacySave</string> <string>16.IBPluginDependency</string> <string>16.IBShouldRemoveOnLegacySave</string> <string>17.IBPluginDependency</string> <string>17.ImportedFromIB2</string> - <string>172.IBPluginDependency</string> - <string>173.IBPluginDependency</string> - <string>173.ImportedFromIB2</string> - <string>174.IBPluginDependency</string> - <string>176.IBAttributePlaceholdersKey</string> - <string>176.IBPluginDependency</string> - <string>177.IBPluginDependency</string> - <string>178.IBNumberFormatterBehaviorMetadataKey</string> - <string>178.IBNumberFormatterLocalizesFormatMetadataKey</string> - <string>178.IBPluginDependency</string> <string>18.IBPluginDependency</string> <string>18.ImportedFromIB2</string> <string>19.IBPluginDependency</string> @@ -1980,48 +1332,27 @@ <string>69.IBPluginDependency</string> <string>7.IBPluginDependency</string> <string>7.ImportedFromIB2</string> - <string>74.IBPluginDependency</string> <string>75.IBAttributePlaceholdersKey</string> <string>75.IBPluginDependency</string> <string>76.IBPluginDependency</string> <string>77.IBPluginDependency</string> <string>78.IBEditorWindowLastContentRect</string> <string>78.IBPluginDependency</string> + <string>79.IBPluginDependency</string> <string>82.IBPluginDependency</string> <string>84.IBAttributePlaceholdersKey</string> <string>84.IBPluginDependency</string> <string>85.IBPluginDependency</string> - <string>86.IBPluginDependency</string> <string>87.IBPluginDependency</string> <string>88.IBPluginDependency</string> <string>93.IBPluginDependency</string> <string>94.IBPluginDependency</string> - <string>96.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{603, 414}, {130, 133}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{580, 299}, {189, 93}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{580, 299}, {189, 93}}</string> <integer value="1"/> - <integer value="1"/> - <boolean value="YES"/> - <string>{292, 112}</string> - <string>{189, 93}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2033,44 +1364,15 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="680776"/> - <string key="toolTip">Custom refresh interval. Must be greater than 0.</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1041"/> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{541, 371}, {575, 203}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{406, 682}, {575, 203}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{406, 682}, {575, 203}}</string> + <string>{{541, 371}, {575, 203}}</string> <integer value="1"/> <string>{{321, 508}, {411, 341}}</string> <integer value="0"/> @@ -2099,7 +1401,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -2111,7 +1412,8 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{385, 524}, {218, 183}}</string> + <string>{{458, 293}, {223, 68}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> @@ -2128,8 +1430,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -2148,7 +1448,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">185</int> + <int key="maxID">104</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2234,15 +1534,12 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>closeSheet:</string> <string>copy:</string> <string>killProcessConnection:</string> <string>killProcessQuery:</string> <string>refreshProcessList:</string> <string>saveServerProcesses:</string> - <string>setAutoRefreshInterval:</string> - <string>setCustomAutoRefreshInterval:</string> - <string>toggleProcessListAutoRefresh:</string> + <string>toggeleShowFullProcessList:</string> <string>toggleShowProcessID:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -2254,20 +1551,12 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>autoRefreshButton</string> - <string>autoRefreshIntervalMenuItem</string> - <string>customIntervalButton</string> - <string>customIntervalTextField</string> - <string>customIntervalWindow</string> <string>filterProcessesSearchField</string> <string>processListTableView</string> <string>processesCountTextField</string> @@ -2277,11 +1566,6 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSButton</string> - <string>NSMenuItem</string> - <string>NSButton</string> - <string>NSTextField</string> - <string>NSWindow</string> <string>NSSearchField</string> <string>NSTableView</string> <string>NSTextField</string> @@ -2445,14 +1729,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSNumberFormatter</string> - <string key="superclassName">NSFormatter</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSNumberFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -2977,7 +2253,6 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -2989,26 +2264,5 @@ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSMenuCheckmark</string> - <string>NSMenuMixedState</string> - <string>NSSwitch</string> - <string>button_action</string> - <string>button_bar_spacer</string> - <string>button_refresh</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{9, 8}</string> - <string>{7, 2}</string> - <string>{15, 15}</string> - <string>{32, 23}</string> - <string>{10, 23}</string> - <string>{32, 23}</string> - </object> - </object> </data> </archive> diff --git a/Interfaces/English.lproj/ImportAccessory.xib b/Interfaces/English.lproj/ImportAccessory.xib index 1b709b7a..dfb6d7e8 100644 --- a/Interfaces/English.lproj/ImportAccessory.xib +++ b/Interfaces/English.lproj/ImportAccessory.xib @@ -2,18 +2,17 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1060</int> - <string key="IBDocument.SystemVersion">10D573</string> - <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.29</string> - <string key="IBDocument.HIToolboxVersion">460.00</string> + <string key="IBDocument.SystemVersion">10B504</string> + <string key="IBDocument.InterfaceBuilderVersion">732</string> + <string key="IBDocument.AppKitVersion">1038.2</string> + <string key="IBDocument.HIToolboxVersion">437.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">740</string> + <string key="NS.object.0">732</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> - <integer value="86"/> + <integer value="4"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -107,7 +106,7 @@ <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">controlTextColor</string> - <object class="NSColor" key="NSColor" id="847759587"> + <object class="NSColor" key="NSColor"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MAA</bytes> </object> @@ -163,7 +162,7 @@ <string key="NSColorName">controlBackgroundColor</string> <object class="NSColor" key="NSColor" id="210193283"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <reference key="NSTextColor" ref="107914506"/> @@ -634,260 +633,6 @@ <object class="NSUserDefaultsController" id="71396687"> <bool key="NSSharedInstance">YES</bool> </object> - <object class="NSWindowTemplate" id="951794958"> - <int key="NSWindowStyleMask">15</int> - <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{131, 75}, {500, 353}}</string> - <int key="NSWTFlags">1954022400</int> - <string key="NSWindowTitle">Window</string> - <string key="NSWindowClass">NSWindow</string> - <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> - <string key="NSWindowContentMinSize">{500, 353}</string> - <object class="NSView" key="NSWindowView" id="544284300"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSScrollView" id="622997883"> - <reference key="NSNextResponder" ref="544284300"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="51216656"> - <reference key="NSNextResponder" ref="622997883"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="770071618"> - <reference key="NSNextResponder" ref="51216656"/> - <int key="NSvFlags">2322</int> - <string key="NSFrameSize">{500, 29}</string> - <reference key="NSSuperview" ref="51216656"/> - <object class="NSTextContainer" key="NSTextContainer" id="243631584"> - <object class="NSLayoutManager" key="NSLayoutManager"> - <object class="NSTextStorage" key="NSTextStorage"> - <object class="NSMutableString" key="NSString"> - <characters key="NS.bytes"/> - </object> - <nil key="NSDelegate"/> - </object> - <object class="NSMutableArray" key="NSTextContainers"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="243631584"/> - </object> - <int key="NSLMFlags">134</int> - <nil key="NSDelegate"/> - </object> - <reference key="NSTextView" ref="770071618"/> - <double key="NSWidth">500</double> - <int key="NSTCFlags">1</int> - </object> - <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">2305</int> - <int key="NSTextCheckingTypes">0</int> - <nil key="NSMarkedAttributes"/> - <reference key="NSBackgroundColor" ref="51181249"/> - <object class="NSDictionary" key="NSSelectedAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSBackgroundColor</string> - <string>NSColor</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">selectedTextBackgroundColor</string> - <reference key="NSColor" ref="210193283"/> - </object> - <object class="NSColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">selectedTextColor</string> - <reference key="NSColor" ref="847759587"/> - </object> - </object> - </object> - <reference key="NSInsertionColor" ref="847759587"/> - <object class="NSDictionary" key="NSLinkAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor</string> - <string>NSCursor</string> - <string>NSUnderline</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MCAwIDEAA</bytes> - </object> - <object class="NSCursor"> - <string key="NSHotSpot">{8, -8}</string> - <int key="NSCursorType">13</int> - </object> - <integer value="1"/> - </object> - </object> - <nil key="NSDefaultParagraphStyle"/> - </object> - <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{1002, 1e+07}</string> - <string key="NSMinize">{223, 0}</string> - <nil key="NSDelegate"/> - </object> - </object> - <string key="NSFrame">{{1, 1}, {500, 124}}</string> - <reference key="NSSuperview" ref="622997883"/> - <reference key="NSNextKeyView" ref="770071618"/> - <reference key="NSDocView" ref="770071618"/> - <reference key="NSBGColor" ref="51181249"/> - <object class="NSCursor" key="NSCursor"> - <string key="NSHotSpot">{4, -5}</string> - <int key="NSCursorType">1</int> - </object> - <int key="NScvFlags">4</int> - </object> - <object class="NSScroller" id="177496810"> - <reference key="NSNextResponder" ref="622997883"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{486, 1}, {15, 109}}</string> - <reference key="NSSuperview" ref="622997883"/> - <reference key="NSTarget" ref="622997883"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.99248123168945312</double> - </object> - <object class="NSScroller" id="268141998"> - <reference key="NSNextResponder" ref="622997883"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{1, 110}, {485, 15}}</string> - <reference key="NSSuperview" ref="622997883"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="622997883"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1</double> - <double key="NSPercent">0.94565218687057495</double> - </object> - </object> - <string key="NSFrame">{{-1, 195}, {502, 126}}</string> - <reference key="NSSuperview" ref="544284300"/> - <reference key="NSNextKeyView" ref="51216656"/> - <int key="NSsFlags">562</int> - <reference key="NSVScroller" ref="177496810"/> - <reference key="NSHScroller" ref="268141998"/> - <reference key="NSContentView" ref="51216656"/> - </object> - <object class="NSButton" id="762525145"> - <reference key="NSNextResponder" ref="544284300"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{322, 7}, {82, 32}}</string> - <reference key="NSSuperview" ref="544284300"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="77256603"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Cancel</string> - <reference key="NSSupport" ref="857116476"/> - <reference key="NSControlView" ref="762525145"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="660428801"> - <reference key="NSNextResponder" ref="544284300"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{404, 7}, {82, 32}}</string> - <reference key="NSSuperview" ref="544284300"/> - <int key="NSTag">1</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="437878340"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Next</string> - <reference key="NSSupport" ref="857116476"/> - <reference key="NSControlView" ref="660428801"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSBox" id="603820420"> - <reference key="NSNextResponder" ref="544284300"/> - <int key="NSvFlags">34</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="763529399"> - <reference key="NSNextResponder" ref="603820420"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomView" id="393007690"> - <reference key="NSNextResponder" ref="763529399"/> - <int key="NSvFlags">301</int> - <string key="NSFrame">{{18, 6}, {448, 134}}</string> - <reference key="NSSuperview" ref="763529399"/> - <string key="NSClassName">NSView</string> - </object> - </object> - <string key="NSFrame">{{1, 1}, {484, 143}}</string> - <reference key="NSSuperview" ref="603820420"/> - </object> - </object> - <string key="NSFrame">{{7, 44}, {486, 145}}</string> - <reference key="NSSuperview" ref="544284300"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Box</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSBackgroundColor" ref="989602568"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="763529399"/> - <int key="NSBorderType">1</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">0</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSTextField" id="234640380"> - <reference key="NSNextResponder" ref="544284300"/> - <int key="NSvFlags">269</int> - <string key="NSFrame">{{175, 329}, {146.219, 17}}</string> - <reference key="NSSuperview" ref="544284300"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="467652780"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Import from Clipboard</string> - <reference key="NSSupport" ref="857116476"/> - <reference key="NSControlView" ref="234640380"/> - <reference key="NSBackgroundColor" ref="1043422119"/> - <reference key="NSTextColor" ref="107914506"/> - </object> - </object> - </object> - <string key="NSFrameSize">{500, 353}</string> - <reference key="NSSuperview"/> - </object> - <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> - <string key="NSMinSize">{500, 375}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> - </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -1004,46 +749,6 @@ </object> <int key="connectionID">57</int> </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closeSheet:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="762525145"/> - </object> - <int key="connectionID">98</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closeSheet:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="660428801"/> - </object> - <int key="connectionID">99</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">importFromClipboardSheet</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="951794958"/> - </object> - <int key="connectionID">100</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">importFromClipboardTextView</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="770071618"/> - </object> - <int key="connectionID">101</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">importFromClipboardAccessoryView</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="393007690"/> - </object> - <int key="connectionID">102</int> - </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1284,111 +989,6 @@ <reference key="object" ref="71396687"/> <reference key="parent" ref="0"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">85</int> - <reference key="object" ref="951794958"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="544284300"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Import from Clipboard</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">86</int> - <reference key="object" ref="544284300"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="622997883"/> - <reference ref="603820420"/> - <reference ref="660428801"/> - <reference ref="762525145"/> - <reference ref="234640380"/> - </object> - <reference key="parent" ref="951794958"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">91</int> - <reference key="object" ref="622997883"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="177496810"/> - <reference ref="268141998"/> - <reference ref="770071618"/> - </object> - <reference key="parent" ref="544284300"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">94</int> - <reference key="object" ref="177496810"/> - <reference key="parent" ref="622997883"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">93</int> - <reference key="object" ref="268141998"/> - <reference key="parent" ref="622997883"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">92</int> - <reference key="object" ref="770071618"/> - <reference key="parent" ref="622997883"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">90</int> - <reference key="object" ref="762525145"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="77256603"/> - </object> - <reference key="parent" ref="544284300"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">95</int> - <reference key="object" ref="77256603"/> - <reference key="parent" ref="762525145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">88</int> - <reference key="object" ref="660428801"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="437878340"/> - </object> - <reference key="parent" ref="544284300"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">97</int> - <reference key="object" ref="437878340"/> - <reference key="parent" ref="660428801"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">89</int> - <reference key="object" ref="603820420"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="393007690"/> - </object> - <reference key="parent" ref="544284300"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">96</int> - <reference key="object" ref="393007690"/> - <reference key="parent" ref="603820420"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">103</int> - <reference key="object" ref="234640380"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="467652780"/> - </object> - <reference key="parent" ref="544284300"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">104</int> - <reference key="object" ref="467652780"/> - <reference key="parent" ref="234640380"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1401,8 +1001,6 @@ <string>1.ImportedFromIB2</string> <string>10.IBPluginDependency</string> <string>10.ImportedFromIB2</string> - <string>103.IBPluginDependency</string> - <string>104.IBPluginDependency</string> <string>11.IBAttributePlaceholdersKey</string> <string>11.IBPluginDependency</string> <string>11.ImportedFromIB2</string> @@ -1439,37 +1037,18 @@ <string>8.IBAttributePlaceholdersKey</string> <string>8.IBPluginDependency</string> <string>8.ImportedFromIB2</string> - <string>85.IBEditorWindowLastContentRect</string> - <string>85.IBPluginDependency</string> - <string>85.IBWindowTemplateEditedContentRect</string> - <string>85.NSWindowTemplate.visibleAtLaunch</string> - <string>85.windowTemplate.hasMinSize</string> - <string>85.windowTemplate.minSize</string> - <string>86.IBPluginDependency</string> - <string>88.IBPluginDependency</string> - <string>89.IBPluginDependency</string> <string>9.IBAttributePlaceholdersKey</string> <string>9.IBPluginDependency</string> <string>9.ImportedFromIB2</string> - <string>90.IBPluginDependency</string> - <string>91.IBPluginDependency</string> - <string>92.IBPluginDependency</string> - <string>93.IBPluginDependency</string> - <string>94.IBPluginDependency</string> - <string>95.IBPluginDependency</string> - <string>96.IBPluginDependency</string> - <string>97.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{583, 146}, {417, 135}}</string> + <string>{{107, 435}, {417, 135}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -1527,15 +1106,6 @@ </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{674, 272}, {500, 353}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{674, 272}, {500, 353}}</string> - <boolean value="NO"/> - <boolean value="YES"/> - <string>{500, 353}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -1546,14 +1116,6 @@ </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -1572,7 +1134,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">104</int> + <int key="maxID">57</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> @@ -1586,10 +1148,12 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>cancelProgressBar:</string> <string>changeFormat:</string> + <string>changeTable:</string> <string>closeSheet:</string> <string>panelSelectionDidChange:</string> <string>reloadTables:</string> <string>selectTables:</string> + <string>stepRow:</string> <string>switchInput:</string> <string>switchTab:</string> </object> @@ -1603,6 +1167,8 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -1638,20 +1204,22 @@ <string>exportTableList</string> <string>exportToolbar</string> <string>exportWindow</string> + <string>fieldMappingPopup</string> + <string>fieldMappingSheet</string> + <string>fieldMappingTableView</string> <string>importCSVBox</string> <string>importCSVView</string> - <string>importFieldMapperSheetWindow</string> <string>importFieldNamesSwitch</string> <string>importFieldsEnclosedField</string> <string>importFieldsEscapedField</string> <string>importFieldsTerminatedField</string> <string>importFormatPopup</string> - <string>importFromClipboardAccessoryView</string> - <string>importFromClipboardSheet</string> - <string>importFromClipboardTextView</string> <string>importLinesTerminatedField</string> <string>multiCSVFullStreamingSwitch</string> <string>multiXMLFullStreamingSwitch</string> + <string>recordCountLabel</string> + <string>rowDownButton</string> + <string>rowUpButton</string> <string>singleProgressBar</string> <string>singleProgressSheet</string> <string>singleProgressText</string> @@ -1702,10 +1270,12 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> <string>NSPopUpButton</string> <string>id</string> <string>id</string> - <string>NSTextView</string> + <string>id</string> <string>id</string> <string>id</string> <string>id</string> diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 85d5b22a..4ef2b1eb 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -2,17 +2,17 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10D573</string> - <string key="IBDocument.InterfaceBuilderVersion">762</string> + <string key="IBDocument.SystemVersion">10D2094</string> + <string key="IBDocument.InterfaceBuilderVersion">740</string> <string key="IBDocument.AppKitVersion">1038.29</string> <string key="IBDocument.HIToolboxVersion">460.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">762</string> + <string key="NS.object.0">740</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="628"/> + <integer value="29"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -373,17 +373,6 @@ <reference key="NSMixedImage" ref="315854375"/> <int key="NSTag">1007</int> </object> - <object class="NSMenuItem" id="853409386"> - <reference key="NSMenu" ref="709725194"/> - <bool key="NSIsAlternate">YES</bool> - <string key="NSTitle">Import from Clipboard…</string> - <string key="NSKeyEquiv">I</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - <int key="NSTag">1101</int> - </object> <object class="NSMenuItem" id="934534577"> <reference key="NSMenu" ref="709725194"/> <bool key="NSIsDisabled">YES</bool> @@ -1266,45 +1255,20 @@ </object> <object class="NSMenuItem" id="602994413"> <reference key="NSMenu" ref="172963563"/> - <string key="NSTitle">Delete Database...</string> + <string key="NSTitle">Remove Database...</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="625762401"/> <reference key="NSMixedImage" ref="315854375"/> </object> - <object class="NSMenuItem" id="817548288"> - <reference key="NSMenu" ref="172963563"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - <object class="NSMenuItem" id="820553150"> - <reference key="NSMenu" ref="172963563"/> - <string key="NSTitle">Duplicate Database...</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - <object class="NSMenuItem" id="97991687"> - <reference key="NSMenu" ref="172963563"/> - <string key="NSTitle">Rename Database...</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - <object class="NSMenuItem" id="93508151"> + <object class="NSMenuItem" id="788707136"> <reference key="NSMenu" ref="172963563"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> <string key="NSTitle"/> <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="625762401"/> <reference key="NSMixedImage" ref="315854375"/> @@ -2957,19 +2921,11 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">importFromClipboard:</string> - <reference key="source" ref="63651044"/> - <reference key="destination" ref="853409386"/> - </object> - <int key="connectionID">1072</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">exportTable:</string> <reference key="source" ref="63651044"/> <reference key="destination" ref="146976252"/> </object> - <int key="connectionID">1073</int> + <int key="connectionID">1071</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> @@ -2977,7 +2933,7 @@ <reference key="source" ref="63651044"/> <reference key="destination" ref="609924406"/> </object> - <int key="connectionID">1074</int> + <int key="connectionID">1072</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> @@ -2985,7 +2941,7 @@ <reference key="source" ref="63651044"/> <reference key="destination" ref="423106625"/> </object> - <int key="connectionID">1075</int> + <int key="connectionID">1073</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> @@ -2993,23 +2949,7 @@ <reference key="source" ref="63651044"/> <reference key="destination" ref="499136806"/> </object> - <int key="connectionID">1076</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">copyDatabase:</string> - <reference key="source" ref="63651044"/> - <reference key="destination" ref="820553150"/> - </object> - <int key="connectionID">1080</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">renameDatabase:</string> - <reference key="source" ref="63651044"/> - <reference key="destination" ref="97991687"/> - </object> - <int key="connectionID">1083</int> + <int key="connectionID">1074</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -3231,7 +3171,6 @@ <reference ref="949877576"/> <reference ref="276532848"/> <reference ref="390057667"/> - <reference ref="853409386"/> </object> <reference key="parent" ref="86447006"/> </object> @@ -3448,6 +3387,8 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="653250987"/> + <reference ref="602994413"/> + <reference ref="788707136"/> <reference ref="265095049"/> <reference ref="14535230"/> <reference ref="197143231"/> @@ -3457,11 +3398,6 @@ <reference ref="6656160"/> <reference ref="806896137"/> <reference ref="7204100"/> - <reference ref="93508151"/> - <reference ref="97991687"/> - <reference ref="817548288"/> - <reference ref="602994413"/> - <reference ref="820553150"/> </object> <reference key="parent" ref="693420496"/> </object> @@ -3476,6 +3412,11 @@ <reference key="parent" ref="172963563"/> </object> <object class="IBObjectRecord"> + <int key="objectID">632</int> + <reference key="object" ref="788707136"/> + <reference key="parent" ref="172963563"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">633</int> <reference key="object" ref="265095049"/> <reference key="parent" ref="172963563"/> @@ -4417,31 +4358,6 @@ <reference key="object" ref="486174990"/> <reference key="parent" ref="466354362"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">1071</int> - <reference key="object" ref="853409386"/> - <reference key="parent" ref="709725194"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1077</int> - <reference key="object" ref="820553150"/> - <reference key="parent" ref="172963563"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1079</int> - <reference key="object" ref="93508151"/> - <reference key="parent" ref="172963563"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1081</int> - <reference key="object" ref="97991687"/> - <reference key="parent" ref="172963563"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1084</int> - <reference key="object" ref="817548288"/> - <reference key="parent" ref="172963563"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -4475,13 +4391,6 @@ <string>106.ImportedFromIB2</string> <string>106.editorWindowContentRectSynchronizationRect</string> <string>1061.IBPluginDependency</string> - <string>1071.IBPluginDependency</string> - <string>1077.IBPluginDependency</string> - <string>1077.ImportedFromIB2</string> - <string>1079.IBPluginDependency</string> - <string>1081.IBPluginDependency</string> - <string>1081.ImportedFromIB2</string> - <string>1084.IBPluginDependency</string> <string>111.IBPluginDependency</string> <string>111.ImportedFromIB2</string> <string>129.IBPluginDependency</string> @@ -4648,6 +4557,8 @@ <string>629.ImportedFromIB2</string> <string>631.IBPluginDependency</string> <string>631.ImportedFromIB2</string> + <string>632.IBPluginDependency</string> + <string>632.ImportedFromIB2</string> <string>633.IBPluginDependency</string> <string>633.ImportedFromIB2</string> <string>634.IBPluginDependency</string> @@ -4843,19 +4754,12 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{852, 432}, {204, 153}}</string> + <string>{{824, 199}, {204, 153}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{561, 605}, {181, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -4902,7 +4806,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{604, 304}, {280, 283}}</string> + <string>{{470, 541}, {280, 283}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{654, 613}, {157, 223}}</string> @@ -4930,11 +4834,11 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{781, 512}, {194, 73}}</string> + <string>{{701, 475}, {194, 73}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{449, 1007}, {197, 53}}</string> - <string>{{402, 585}, {511, 20}}</string> + <string>{{38, 836}, {511, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{506, 836}, {511, 20}}</string> @@ -4944,7 +4848,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{609, 91}, {210, 133}}</string> + <string>{{379, 473}, {210, 133}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{399, 465}, {213, 93}}</string> @@ -4954,17 +4858,17 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{819, 131}, {133, 43}}</string> + <string>{{589, 513}, {133, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{819, 91}, {133, 43}}</string> + <string>{{914, 300}, {136, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{819, 71}, {133, 43}}</string> + <string>{{914, 280}, {136, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -4987,7 +4891,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{648, 294}, {251, 293}}</string> + <string>{{230, 543}, {251, 293}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{698, 703}, {184, 133}}</string> @@ -5005,7 +4909,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{468, 334}, {229, 253}}</string> + <string>{{145, 483}, {229, 253}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{518, 583}, {218, 253}}</string> @@ -5013,7 +4917,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{644, 332}, {255, 253}}</string> + <string>{{564, 345}, {255, 203}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{312, 683}, {231, 153}}</string> @@ -5025,7 +4929,9 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{815, 44}, {276, 423}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>{{849, 130}, {276, 423}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{556, 185}, {279, 383}}</string> @@ -5080,7 +4986,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{725, 352}, {292, 233}}</string> + <string>{{361, 603}, {292, 233}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{829, 663}, {268, 173}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5107,7 +5013,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{562, 234}, {273, 353}}</string> + <string>{{144, 503}, {235, 333}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{180, 535}, {182, 253}}</string> @@ -5115,7 +5021,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{819, 111}, {133, 43}}</string> + <string>{{589, 493}, {133, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5258,7 +5164,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">1084</int> + <int key="maxID">1074</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -5629,15 +5535,12 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>closeSheet:</string> <string>copy:</string> <string>killProcessConnection:</string> <string>killProcessQuery:</string> <string>refreshProcessList:</string> <string>saveServerProcesses:</string> - <string>setAutoRefreshInterval:</string> - <string>setCustomAutoRefreshInterval:</string> - <string>toggleProcessListAutoRefresh:</string> + <string>toggeleShowFullProcessList:</string> <string>toggleShowProcessID:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -5649,20 +5552,12 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>autoRefreshButton</string> - <string>autoRefreshIntervalMenuItem</string> - <string>customIntervalButton</string> - <string>customIntervalTextField</string> - <string>customIntervalWindow</string> <string>filterProcessesSearchField</string> <string>processListTableView</string> <string>processesCountTextField</string> @@ -5672,11 +5567,6 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSButton</string> - <string>NSMenuItem</string> - <string>NSButton</string> - <string>NSTextField</string> - <string>NSWindow</string> <string>NSSearchField</string> <string>NSTableView</string> <string>NSTextField</string> @@ -5973,7 +5863,6 @@ <string>copyChecksumFromSheet:</string> <string>copyCreateTableSyntax:</string> <string>copyCreateTableSyntaxFromSheet:</string> - <string>copyDatabase:</string> <string>export:</string> <string>exportMultipleTables:</string> <string>exportTable:</string> @@ -5982,11 +5871,9 @@ <string>focusOnTableContentFilter:</string> <string>focusOnTableListFilter:</string> <string>import:</string> - <string>importFromClipboard:</string> <string>openCurrentConnectionInNewWindow:</string> <string>optimizeTable:</string> <string>removeDatabase:</string> - <string>renameDatabase:</string> <string>repairTable:</string> <string>saveConnectionSheet:</string> <string>saveCreateSyntax:</string> @@ -6054,9 +5941,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -6067,20 +5951,14 @@ <string>chooseDatabaseButton</string> <string>connectionErrorDialog</string> <string>contentViewSplitter</string> - <string>copyDatabaseButton</string> - <string>copyOnlyStructureButton</string> <string>createTableSyntaxTextField</string> <string>createTableSyntaxTextView</string> <string>createTableSyntaxWindow</string> <string>customQueryInstance</string> <string>customQueryTextView</string> - <string>databaseCopyNameField</string> <string>databaseDataInstance</string> <string>databaseEncodingButton</string> <string>databaseNameField</string> - <string>databaseNewSheet</string> - <string>databaseRenameNameField</string> - <string>databaseRenameSheet</string> <string>databaseSheet</string> <string>dbTablesTableView</string> <string>encodingPopUp</string> @@ -6094,7 +5972,6 @@ <string>inputTextWindowSecureTextField</string> <string>listFilterField</string> <string>queryProgressBar</string> - <string>renameDatabaseButton</string> <string>saveConnectionAccessory</string> <string>saveConnectionAutoConnect</string> <string>saveConnectionEncrypt</string> @@ -6137,8 +6014,6 @@ <string>id</string> <string>NSWindow</string> <string>NSSplitView</string> - <string>id</string> - <string>id</string> <string>NSTextField</string> <string>NSTextView</string> <string>NSWindow</string> @@ -6148,10 +6023,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> <string>NSTableView</string> <string>NSPopUpButton</string> <string>id</string> @@ -6167,7 +6038,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> <string>NSSecureTextField</string> <string>id</string> <string>id</string> @@ -6243,473 +6113,12 @@ </object> <object class="IBPartialClassDescription"> <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="984586479"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="755859411"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="922983796"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h</string> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSArrayController</string> - <string key="superclassName">NSObjectController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSArrayController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSBox</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSBox.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSBrowser</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButton</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="199684283"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSController</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDictionary</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="272976720"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSDictionary.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDictionary</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="455788966"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDictionary</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="162195470"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDocument</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>printDocument:</string> - <string>revertDocumentToSaved:</string> - <string>runPageLayout:</string> - <string>saveDocument:</string> - <string>saveDocumentAs:</string> - <string>saveDocumentTo:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDocument.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDocument</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDocumentScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDocumentController</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>clearRecentDocuments:</string> - <string>newDocument:</string> - <string>openDocument:</string> - <string>saveAllDocuments:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDocumentController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMatrix</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="220472377"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="206846662"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMovieView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMovieView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMutableDictionary</string> - <string key="superclassName">NSDictionary</string> - <reference key="sourceIdentifier" ref="272976720"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMutableDictionary</string> - <reference key="sourceIdentifier" ref="162195470"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="984586479"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="755859411"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="922983796"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="199684283"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="220472377"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="621465764"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="768142200"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="406849156"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSError.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="455788966"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="162195470"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -6731,220 +6140,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebDownload.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebEditingDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebFrameLoadDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebJavaPlugIn.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPlugin.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPluginContainer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPolicyDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebResourceLoadDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebScriptObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebUIDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObjectController</string> - <string key="superclassName">NSController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSObjectController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSOutlineView</string> - <string key="superclassName">NSTableView</string> - <reference key="sourceIdentifier" ref="621465764"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSPopUpButton</string> - <string key="superclassName">NSButton</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSProgressIndicator</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSProgressIndicator.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSScrollView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSearchField</string> - <string key="superclassName">NSTextField</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSearchField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSecureTextField</string> - <string key="superclassName">NSTextField</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSecureTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSplitView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTabView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTabView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTableView</string> - <string key="superclassName">NSControl</string> - <reference key="sourceIdentifier" ref="768142200"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSText</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSText.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextField</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextView</string> - <string key="superclassName">NSText</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTreeController</string> - <string key="superclassName">NSObjectController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTreeController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <reference key="sourceIdentifier" ref="206846662"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="406849156"/> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -6955,44 +6150,10 @@ <string key="className">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h</string> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSWindowController</string> - <string key="superclassName">NSResponder</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showWindow:</string> - <string key="NS.object.0">id</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">SUUpdater</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> @@ -7005,49 +6166,9 @@ </object> <reference key="sourceIdentifier" ref="882108081"/> </object> - <object class="IBPartialClassDescription"> - <string key="className">WebView</string> - <string key="superclassName">NSView</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>goBack:</string> - <string>goForward:</string> - <string>makeTextLarger:</string> - <string>makeTextSmaller:</string> - <string>makeTextStandardSize:</string> - <string>reload:</string> - <string>reloadFromOrigin:</string> - <string>stopLoading:</string> - <string>takeStringURLFrom:</string> - <string>toggleContinuousSpellChecking:</string> - <string>toggleSmartInsertDelete:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebView.h</string> - </object> - </object> </object> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -7063,18 +6184,5 @@ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSMenuCheckmark</string> - <string>NSMenuMixedState</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{9, 8}</string> - <string>{7, 2}</string> - </object> - </object> </data> </archive> @@ -2,8 +2,7 @@ BUILDING SEQUEL PRO ------------------- Before you can start making changes to any of the xib files in Interface -Builder you will need to install the BWToolkit plugin from -http://www.brandonwalkin.com/bwtoolkit/. +Builder you will need to install the BWToolkit plugin. To install the plugin you will need to do a Release build of the project so that the BWTookit plugin and frameworks are compiled. diff --git a/Resources/Credits.rtf b/Resources/Credits.rtf index 588606db..fb0b3006 100644 --- a/Resources/Credits.rtf +++ b/Resources/Credits.rtf @@ -1,7 +1,6 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red25\green25\blue25;\red0\green27\blue199;} -\vieww9000\viewh8400\viewkind0 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \f0\b\fs22 \cf2 Current Developers @@ -19,8 +18,6 @@ Jakob Egger\ \pard\pardeftab720\qc {\field{\*\fldinst{HYPERLINK "http://www.bibiko.de/"}}{\fldrslt \cf3 \ul \ulc3 Hans-J\'f6rg Bibiko}}\ Jim Knight\ -\pard\pardeftab720\qc -{\field{\*\fldinst{HYPERLINK "http://www.rekowski.info"}}{\fldrslt \cf0 David Rekowski}}\ \ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural @@ -89,7 +86,7 @@ Ci\'e1ran Walsh, Allan Odgaard\ \b \cf0 FeedbackReporter \b0 \ -Copyright (c) 2009\ +\cf0 Copyright (c) 2009\ \pard\pardeftab720\qc {\field{\*\fldinst{HYPERLINK "http://vafer.org/"}}{\fldrslt \cf0 Torsten Curdt}}\ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural @@ -102,4 +99,4 @@ Copyright (c) 2009\ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \cf0 Icon by {\field{\*\fldinst{HYPERLINK "http://nadesign.net/"}}{\fldrslt Na Wong}} and {\field{\*\fldinst{HYPERLINK "http://www.benperry.com.au/"}}{\fldrslt Ben Perry}}\ GUI design by {\field{\*\fldinst{HYPERLINK "http://www.sequelpro.com/"}}{\fldrslt Sequel Pro}} team.\ -}
\ No newline at end of file +} diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings Binary files differindex 3306c454..9e44729b 100644 --- a/Resources/English.lproj/Localizable.strings +++ b/Resources/English.lproj/Localizable.strings diff --git a/Resources/PreferenceDefaults.plist b/Resources/PreferenceDefaults.plist index 56b43134..5a994493 100644 --- a/Resources/PreferenceDefaults.plist +++ b/Resources/PreferenceDefaults.plist @@ -145,8 +145,6 @@ <string>\</string> <key>CSVImportFirstLineIsHeader</key> <true/> - <key>SQLExportUseCompression</key> - <false/> <key>NoBOMforSQLdumpFile</key> <true/> <key>BlobTextEditorSpellCheckingEnabled</key> @@ -159,10 +157,8 @@ <integer>1000</integer> <key>ProcessListShowProcessID</key> <true/> - <key>ProcessListEnableAutoRefresh</key> - <false/> - <key>ProcessListAutoRrefreshInterval</key> - <integer>10</integer> + <key>ProcessListShowFullProcessList</key> + <true/> <key>FavoritesSortedBy</key> <integer>0</integer> <key>FavoritesSortedInReverse</key> diff --git a/Scripts/build-mysql-client.sh b/Scripts/build-mysql-client.sh index 3870162c..1d0464e3 100755 --- a/Scripts/build-mysql-client.sh +++ b/Scripts/build-mysql-client.sh @@ -20,7 +20,7 @@ CLEAN='NO' export CFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 -arch x86_64 -O3 -fno-omit-frame-pointer -mmacosx-version-min=10.5' export CXXFLAGS='-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 -arch x86_64 -O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mmacosx-version-min=10.5' -CONFIGURE_OPTIONS='--without-server --enable-thread-safe-client --disable-dependency-tracking --enable-local-infile' +CONFIGURE_OPTIONS='--without-server --enable-thread-safe-client --disable-dependency-tracking' BINARY_DISTRIBUTION_SCRIPT='scripts/make_binary_distribution' usage() diff --git a/Source/CMImageView.m b/Source/CMImageView.m index 32d60d13..31eb9c60 100644 --- a/Source/CMImageView.m +++ b/Source/CMImageView.m @@ -123,4 +123,4 @@ [delegateForUse processPasteImageData]; } -@end +@end
\ No newline at end of file diff --git a/Source/CMTextView.m b/Source/CMTextView.m index e936e801..efe18042 100644 --- a/Source/CMTextView.m +++ b/Source/CMTextView.m @@ -34,7 +34,6 @@ #import "SPTooltip.h" #import "TablesList.h" #import "SPNavigatorController.h" -#import "SPAlertSheets.h" #pragma mark - #pragma mark lex init @@ -536,23 +535,23 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) if(r.location) { NSCharacterSet *ignoreCharacterSet = [NSCharacterSet characterSetWithCharactersInString:@"\"'`;,()[]{}=+/<> \t\n\r"]; - // Check the previous character and don't autocomplete if the character is whitespace or certain types of punctuation - if ([ignoreCharacterSet characterIsMember:[[self string] characterAtIndex:r.location - 1]]) return; + // Check the previous character and don't autocomplete if the character is whitespace or certain types of punctuation + if ([ignoreCharacterSet characterIsMember:[[self string] characterAtIndex:r.location - 1]]) return; - // Suppress auto-completion if the window isn't active anymore - if ([[NSApp keyWindow] firstResponder] != self) return; + // Suppress auto-completion if the window isn't active anymore + if ([[NSApp keyWindow] firstResponder] != self) return; - // Trigger the completion - [self doCompletionByUsingSpellChecker:NO fuzzyMode:NO autoCompleteMode:YES]; + // Trigger the completion + [self doCompletionByUsingSpellChecker:NO fuzzyMode:NO autoCompleteMode:YES]; } } - (void) refreshCompletion { - if(completionWasRefreshed) return; - completionWasRefreshed = YES; - [self doCompletionByUsingSpellChecker:NO fuzzyMode:completionFuzzyMode autoCompleteMode:NO]; + if(completionWasRefreshed) return; + completionWasRefreshed = YES; + [self doCompletionByUsingSpellChecker:NO fuzzyMode:completionFuzzyMode autoCompleteMode:NO]; } - (void) doCompletionByUsingSpellChecker:(BOOL)isDictMode fuzzyMode:(BOOL)fuzzySearch autoCompleteMode:(BOOL)autoCompleteMode @@ -569,7 +568,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) } [self breakUndoCoalescing]; - + // Remember state for refreshCompletion completionFuzzyMode = fuzzySearch; @@ -1307,6 +1306,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) if (completionIsOpen) [completionPopup close], completionPopup = nil; completionIsOpen = YES; + completionPopup = [[SPNarrowDownCompletion alloc] initWithItems:possibleCompletions alreadyTyped:@"" staticPrefix:@"" @@ -1463,6 +1463,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) if (completionIsOpen) [completionPopup close], completionPopup = nil; completionIsOpen = YES; + completionPopup = [[SPNarrowDownCompletion alloc] initWithItems:possibleCompletions alreadyTyped:@"" staticPrefix:@"" @@ -2677,11 +2678,11 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) } [self setTypingAttributes:textAttributes]; [self setDefaultParagraphStyle:paragraphStyle]; + [paragraphStyle release]; [self setFont:tvFont]; [self setEditable:oldEditableStatus]; - [paragraphStyle release]; } - (void)drawRect:(NSRect)rect { @@ -3316,4 +3317,4 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) [super dealloc]; } -@end +@end
\ No newline at end of file diff --git a/Source/SPAlertSheets.h b/Source/SPAlertSheets.h index bdcfdd64..2610ee41 100644 --- a/Source/SPAlertSheets.h +++ b/Source/SPAlertSheets.h @@ -33,4 +33,4 @@ void SPBeginAlertSheet( SEL didDismissSelector, void *contextInfo, NSString *msg -); +);
\ No newline at end of file diff --git a/Source/SPAppController.m b/Source/SPAppController.m index f793b93c..f0d4c9bf 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -441,7 +441,6 @@ @"queryHistory", @"tableColumnWidths", @"savePath", - @"NSRecentDocumentRecords", nil]]; return preferences; diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index f2d5fcdd..1f19ba1e 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -523,8 +523,8 @@ [prefsController showWindow:self]; [prefsController displayFavoritePreferences:self]; - - if ([favoritesTable numberOfSelectedRows]) [prefsController selectFavorites:[NSArray arrayWithObject:[self valueForKeyPath:@"selectedFavorite"]]]; + + if ([favoritesTable numberOfSelectedRows]) [prefsController selectFavorites:[NSArray arrayWithObject:[self valueForKeyPath:@"selectedFavorite"]]]; } /** diff --git a/Source/SPConnectionDelegate.m b/Source/SPConnectionDelegate.m index ae67697c..c69c3150 100644 --- a/Source/SPConnectionDelegate.m +++ b/Source/SPConnectionDelegate.m @@ -111,22 +111,23 @@ - (MCPConnectionCheck)connectionLost:(id)connection { NSInteger connectionErrorCode = MCPConnectionCheckDisconnect; - - // Only display the reconnect dialog if the window is visible - if ([tableWindow isVisible]) { - - // Display the connection error dialog and wait for the return code - [NSApp beginSheet:connectionErrorDialog modalForWindow:tableWindow modalDelegate:self didEndSelector:nil contextInfo:nil]; - connectionErrorCode = [NSApp runModalForWindow:connectionErrorDialog]; - - [NSApp endSheet:connectionErrorDialog]; - [connectionErrorDialog orderOut:nil]; - - // If 'disconnect' was selected, trigger a window close. - if (connectionErrorCode == MCPConnectionCheckDisconnect) { - [self performSelectorOnMainThread:@selector(closeDocumentWindowAndDisconnect) withObject:nil waitUntilDone:YES]; + + // Only display the reconnect dialog if the window is visible + if ([tableWindow isVisible]) { + + // Display the connection error dialog and wait for the return code + [NSApp beginSheet:connectionErrorDialog modalForWindow:tableWindow modalDelegate:self didEndSelector:nil contextInfo:nil]; + connectionErrorCode = [NSApp runModalForWindow:connectionErrorDialog]; + + [NSApp endSheet:connectionErrorDialog]; + [connectionErrorDialog orderOut:nil]; + + // If 'disconnect' was selected, trigger a window close. + if (connectionErrorCode == MCPConnectionCheckDisconnect) { + [self performSelectorOnMainThread:@selector(closeDocumentWindowAndDisconnect) withObject:nil waitUntilDone:YES]; + } } - } + return connectionErrorCode; } diff --git a/Source/SPConstants.h b/Source/SPConstants.h index ca84e103..ed25b61e 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -215,8 +215,7 @@ extern NSString *SPEditInSheetEnabled; extern NSString *SPTableInformationPanelCollapsed; extern NSString *SPTableColumnWidths; extern NSString *SPProcessListShowProcessID; -extern NSString *SPProcessListEnableAutoRefresh; -extern NSString *SPProcessListAutoRrefreshInterval; +extern NSString *SPProcessListShowFullProcessList; extern NSString *SPFavoritesSortedBy; extern NSString *SPFavoritesSortedInReverse; @@ -224,15 +223,13 @@ extern NSString *SPFavoritesSortedInReverse; extern NSString *SPPrintWarningRowLimit; extern NSString *SPDisplayServerVersionInWindowTitle; -// Import and export +// Import extern NSString *SPCSVImportFieldTerminator; extern NSString *SPCSVImportLineTerminator; extern NSString *SPCSVImportFieldEnclosedBy; extern NSString *SPCSVImportFieldEscapeCharacter; extern NSString *SPCSVImportFirstLineIsHeader; extern NSString *SPCSVFieldImportMappingAlignment; -extern NSString *SPImportClipboardTempFileNamePrefix; -extern NSString *SPSQLExportUseCompression; // Misc extern NSString *SPContentFilters; diff --git a/Source/SPConstants.m b/Source/SPConstants.m index 3f5bf15a..ba4156e2 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -129,8 +129,7 @@ NSString *SPEditInSheetEnabled = @"EditInSheetEnabled"; NSString *SPTableInformationPanelCollapsed = @"TableInformationPanelCollapsed"; NSString *SPTableColumnWidths = @"tableColumnWidths"; NSString *SPProcessListShowProcessID = @"ProcessListShowProcessID"; -NSString *SPProcessListEnableAutoRefresh = @"ProcessListEnableAutoRefresh"; -NSString *SPProcessListAutoRrefreshInterval = @"ProcessListAutoRrefreshInterval"; +NSString *SPProcessListShowFullProcessList = @"ProcessListShowFullProcessList"; NSString *SPFavoritesSortedBy = @"FavoritesSortedBy"; NSString *SPFavoritesSortedInReverse = @"FavoritesSortedInReverse"; @@ -138,15 +137,13 @@ NSString *SPFavoritesSortedInReverse = @"FavoritesSortedInReverse"; NSString *SPPrintWarningRowLimit = @"PrintWarningRowLimit"; NSString *SPDisplayServerVersionInWindowTitle = @"DisplayServerVersionInWindowTitle"; -// Import and export +// Import NSString *SPCSVImportFieldEnclosedBy = @"CSVImportFieldEnclosedBy"; NSString *SPCSVImportFieldEscapeCharacter = @"CSVImportFieldEscapeCharacter"; NSString *SPCSVImportFieldTerminator = @"CSVImportFieldTerminator"; NSString *SPCSVImportFirstLineIsHeader = @"CSVImportFirstLineIsHeader"; NSString *SPCSVImportLineTerminator = @"CSVImportLineTerminator"; NSString *SPCSVFieldImportMappingAlignment = @"CSVFieldImportMappingAlignment"; -NSString *SPImportClipboardTempFileNamePrefix = @"/tmp/_SP_ClipBoard_Import_File_"; -NSString *SPSQLExportUseCompression = @"SQLExportUseCompression"; // Misc NSString *SPContentFilters = @"ContentFilters"; diff --git a/Source/SPDBActionCommons.h b/Source/SPDBActionCommons.h deleted file mode 100644 index 334b0c78..00000000 --- a/Source/SPDBActionCommons.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// $Id$ -// -// SPDBActionCommons.h -// sequel-pro -// -// Created by David Rekowski on Apr 29, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import <Foundation/Foundation.h> -#import <Cocoa/Cocoa.h> -#import <MCPKit/MCPConnection.h> -#import <MCPKit/MCPResult.h> -#import "SPAlertSheets.h" -#import "SPStringAdditions.h" -#import "Sequel-Pro.pch" - -@interface SPDBActionCommons : NSObject { - MCPConnection *connection; - NSWindow *messageWindow; -} - -/** - * @property MCPConnection references the MCPKit connection to MySQL; it has to be set. - */ -@property (retain) MCPConnection *connection; - -/** - * @property the NSWindow instance to send message sheets to - */ -@property (assign) NSWindow *messageWindow; - -@end diff --git a/Source/SPDBActionCommons.m b/Source/SPDBActionCommons.m deleted file mode 100644 index 977b3b5d..00000000 --- a/Source/SPDBActionCommons.m +++ /dev/null @@ -1,35 +0,0 @@ -// -// $Id$ -// -// SPDBActionCommons.m -// sequel-pro -// -// Created by David Rekowski on Apr 29, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import "SPDBActionCommons.h" -#import "SPAlertSheets.h" -#import "SPStringAdditions.h" -#import "Sequel-Pro.pch" - -@implementation SPDBActionCommons - -@synthesize connection; -@synthesize messageWindow; - -@end diff --git a/Source/SPDatabaseCopy.h b/Source/SPDatabaseCopy.h deleted file mode 100644 index 3776d5a1..00000000 --- a/Source/SPDatabaseCopy.h +++ /dev/null @@ -1,66 +0,0 @@ -// -// $Id$ -// -// SPDatabaseCopy.h -// sequel-pro -// -// Created by David Rekowski on Apr 13, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - - -#import "SPDBActionCommons.h" -#import "SPDatabaseInfo.h" - -/** - * The SPDatabaseCopy class povides functionality to create a copy of a database. - */ -@interface SPDatabaseCopy : SPDBActionCommons { - SPDatabaseInfo *dbInfo; -} - -/** - * @property SPDatabaseInfo an instance of the database info class - */ -@property (retain) SPDatabaseInfo *dbInfo; - -/** - * This method retrieves the dbInfo object if it exists; otherwise it is generated and the - * connection is passed to it. - * - * @result SPDatabaseInfo dbInfo object - */ -- (SPDatabaseInfo *)getDBInfoObject; - -/** - * This method clones an existing database. - * - * @param NSString sourceDatabaseName the name of the source database - * @param NSString targetDatabaseName the name of the target database - * @result BOOL success - */ -- (BOOL)copyDatabaseFrom: (NSString *)sourceDatabaseName to: (NSString *)targetDatabaseName withContent: (BOOL)copyWithContent; - -/** - * This method creates a new database. - * - * @param NSString newDatabaseName name of the new database to be created - * @return BOOL YES on success, otherwise NO - */ -- (BOOL) createDatabase: (NSString *)newDatabaseName; - -@end diff --git a/Source/SPDatabaseCopy.m b/Source/SPDatabaseCopy.m deleted file mode 100644 index 2d5f92c3..00000000 --- a/Source/SPDatabaseCopy.m +++ /dev/null @@ -1,105 +0,0 @@ -// -// $Id$ -// -// SPDatabaseCopy.m -// sequel-pro -// -// Created by David Rekowski on Apr 13, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import "SPDBActionCommons.h" -#import "SPDatabaseCopy.h" -#import "SPTableCopy.h" - -@implementation SPDatabaseCopy - -@synthesize dbInfo; - -- (SPDatabaseInfo *)getDBInfoObject { - if (dbInfo != nil) { - return dbInfo; - } else { - dbInfo = [[SPDatabaseInfo alloc] init]; - [dbInfo setConnection:[self connection]]; - [dbInfo setMessageWindow:messageWindow]; - } - return dbInfo; -} - -- (BOOL)copyDatabaseFrom: (NSString *)sourceDatabaseName to: (NSString *)targetDatabaseName withContent:(BOOL)copyWithContent { - - SPDatabaseInfo *databaseInfo = [self getDBInfoObject]; - // check, whether the source database exists and the target database doesn't. - NSArray *tables = [NSArray array]; - BOOL sourceExists = [databaseInfo databaseExists:sourceDatabaseName]; - BOOL targetExists = [databaseInfo databaseExists:targetDatabaseName]; - if (sourceExists && !targetExists) { - // retrieve the list of tables/views/funcs/triggers from the source database - - tables = [connection listTablesFromDB:sourceDatabaseName]; - } else { - SPBeginAlertSheet(NSLocalizedString(@"Cannot create existing database", @"create database exists error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to create the target database.\n\nDatabase %@ already exists.", - @"create database error informative message"), - targetDatabaseName]); - - return NO; - } - DLog(@"list of found tables of source db: %@", tables); - - BOOL success = [self createDatabase:targetDatabaseName]; - SPTableCopy *dbActionTableCopy = [[SPTableCopy alloc] init]; - [dbActionTableCopy setConnection:connection]; - - for (NSString *currentTable in tables) { - if ([dbActionTableCopy copyTable:currentTable - from:sourceDatabaseName - to:targetDatabaseName - withContent:copyWithContent]) { - } else { - success = NO; - } - } - return success; -} - -- (BOOL) createDatabase: (NSString *)newDatabaseName { - NSString *createStatement = [NSString stringWithFormat:@"CREATE DATABASE %@", - [newDatabaseName backtickQuotedString]]; - [connection queryString:createStatement]; - - if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Failed to create database", @"create database error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to create the target database.\n\nMySQL said: %@", - @"create database error informative message"), - [connection getLastErrorMessage]]); - return NO; - } - return YES; - - -} - -- (void)dealloc { - [dbInfo dealloc]; -} - - -@end
\ No newline at end of file diff --git a/Source/SPDatabaseData.h b/Source/SPDatabaseData.h index 29c80aeb..acfbd37c 100644 --- a/Source/SPDatabaseData.h +++ b/Source/SPDatabaseData.h @@ -38,10 +38,6 @@ typedef struct { NSString *characterSetEncoding; - NSInteger serverMajorVersion; - NSInteger serverMinorVersion; - NSInteger serverReleaseVersion; - NSMutableArray *collations; NSMutableArray *characterSetCollations; NSMutableArray *storageEngines; diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m index becd1d6e..8c4935d9 100644 --- a/Source/SPDatabaseData.m +++ b/Source/SPDatabaseData.m @@ -212,18 +212,6 @@ const SPDatabaseCharSets charsets[] = } /** - * Set the current connection the supplied connection instance. - */ -- (void)setConnection:(MCPConnection *)dbConnection -{ - connection = dbConnection; - - serverMajorVersion = [connection serverMajorVersion]; - serverMinorVersion = [connection serverMinorVersion]; - serverReleaseVersion = [connection serverReleaseVersion]; -} - -/** * Reset all the cached values. */ - (void)resetAllData @@ -246,7 +234,7 @@ const SPDatabaseCharSets charsets[] = if ([collations count] == 0) { // Try to retrieve the available collations from the database - if (serverMajorVersion >= 5) + if ([connection serverMajorVersion] >= 5) [collations addObjectsFromArray:[self _getDatabaseDataForQuery:@"SELECT * FROM `information_schema.collations` ORDER BY `collation_name` ASC"]]; // If that failed, get the list of collations from the hard-coded list @@ -279,7 +267,7 @@ const SPDatabaseCharSets charsets[] = characterSetEncoding = [[NSString alloc] initWithString:encoding]; // Try to retrieve the available collations for the supplied encoding from the database - if (serverMajorVersion >= 5) + if ([connection serverMajorVersion] >= 5) [characterSetCollations addObjectsFromArray:[self _getDatabaseDataForQuery:[NSString stringWithFormat:@"SELECT * FROM `information_schema`.`collations` WHERE character_set_name = '%@' ORDER BY `collation_name` ASC", characterSetEncoding]]]; // If that failed, get the list of collations matching the supplied encoding from the hard-coded list @@ -308,7 +296,7 @@ const SPDatabaseCharSets charsets[] = - (NSArray *)getDatabaseStorageEngines { if ([storageEngines count] == 0) { - if (serverMajorVersion < 5) { + if ([connection serverMajorVersion] < 5) { [storageEngines addObject:[NSDictionary dictionaryWithObject:@"MyISAM" forKey:@"Engine"]]; // Check if InnoDB support is enabled @@ -322,7 +310,7 @@ const SPDatabaseCharSets charsets[] = } // Before MySQL 4.1 the MEMORY engine was known as HEAP and the ISAM engine was included - if ((serverMajorVersion <= 4) && (serverMinorVersion < 100)) { + if (([connection serverMajorVersion] <= 4) && ([connection serverMinorVersion] < 100)) { [storageEngines addObject:[NSDictionary dictionaryWithObject:@"HEAP" forKey:@"Engine"]]; [storageEngines addObject:[NSDictionary dictionaryWithObject:@"ISAM" forKey:@"Engine"]]; } @@ -331,28 +319,28 @@ const SPDatabaseCharSets charsets[] = } // BLACKHOLE storage engine was added in MySQL 4.1.11 - if ((serverMajorVersion >= 4) && - (serverMinorVersion >= 1) && - (serverReleaseVersion >= 11)) + if (([connection serverMajorVersion] >= 4) && + ([connection serverMinorVersion] >= 1) && + ([connection serverReleaseVersion] >= 11)) { [storageEngines addObject:[NSDictionary dictionaryWithObject:@"BLACKHOLE" forKey:@"Engine"]]; // ARCHIVE storage engine was added in MySQL 4.1.3 - if (serverReleaseVersion >= 3) { + if ([connection serverReleaseVersion] >= 3) { [storageEngines addObject:[NSDictionary dictionaryWithObject:@"ARCHIVE" forKey:@"Engine"]]; } // CSV storage engine was added in MySQL 4.1.4 - if (serverReleaseVersion >= 4) { + if ([connection serverReleaseVersion] >= 4) { [storageEngines addObject:[NSDictionary dictionaryWithObject:@"CSV" forKey:@"Engine"]]; } } } // The table information_schema.engines didn't exist until MySQL 5.1.5 else { - if ((serverMajorVersion >= 5) && - (serverMinorVersion >= 1) && - (serverReleaseVersion >= 5)) + if (([connection serverMajorVersion] >= 5) && + ([connection serverMinorVersion] >= 1) && + ([connection serverReleaseVersion] >= 5)) { // Check the information_schema.engines table is accessible MCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'ENGINES'"]; @@ -392,7 +380,7 @@ const SPDatabaseCharSets charsets[] = // Try to retrieve the available character set encodings from the database // Check the information_schema.character_sets table is accessible - if (serverMajorVersion >= 5) + if ([connection serverMajorVersion] >= 5) [characterSetEncodings addObjectsFromArray:[self _getDatabaseDataForQuery:@"SELECT * FROM `information_schema`.`character_sets` ORDER BY `character_set_name` ASC"]]; // If that failed, get the list of character set encodings from the hard-coded list @@ -431,6 +419,10 @@ const SPDatabaseCharSets charsets[] = [super dealloc]; } +@end + +@implementation SPDatabaseData (PrivateAPI) + /** * Executes the supplied query against the current connection and returns the result as an array of * NSDictionarys, one for each row. diff --git a/Source/SPDatabaseInfo.h b/Source/SPDatabaseInfo.h deleted file mode 100644 index 3f68b773..00000000 --- a/Source/SPDatabaseInfo.h +++ /dev/null @@ -1,56 +0,0 @@ -// -// $Id$ -// -// SPDatabaseInfo.h -// sequel-pro -// -// Created by David Rekowski on Apr 13, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import "SPDBActionCommons.h" - -/* - * The SPDatabaseInfo class provides means of retrieving a list of database names - */ -@interface SPDatabaseInfo : SPDBActionCommons { -} - -/** - * This method checks, whether a database exists. - * - * @param databaseName the name of the database to check - * @result TRUE if it exists, otherwise FALSE - */ --(BOOL)databaseExists:(NSString *)databaseName; - -/** - * This method retrieves a list of all databases. - * - * @result NSArray databaseNames - */ -- (NSArray *)listDBs; - -/** - * This method retrieves a list of databases like the given string - * - * @param NSString dbsName name of the database substring to match - * @result NSArray databaseNames - */ -- (NSArray *)listDBsLike:(NSString *)dbsName; - -@end diff --git a/Source/SPDatabaseInfo.m b/Source/SPDatabaseInfo.m deleted file mode 100644 index 883ebef2..00000000 --- a/Source/SPDatabaseInfo.m +++ /dev/null @@ -1,73 +0,0 @@ -// -// $Id$ -// -// SPDatbaseInfo.h -// sequel-pro -// -// Created by David Rekowski on Apr 13, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import "SPDBActionCommons.h" -#import "SPDatabaseInfo.h" - -@implementation SPDatabaseInfo - --(BOOL)databaseExists:(NSString *)databaseName { - NSArray *names = [self listDBs]; - return [names containsObject:databaseName]; -} - -- (NSArray *)listDBs { - return [self listDBsLike:nil]; -} - -- (NSArray *)listDBsLike:(NSString *)dbsName -{ - NSString *listDBStatement = nil; - if ((dbsName == nil) || ([dbsName isEqualToString:@""])) { - listDBStatement = [NSString stringWithFormat:@"SHOW DATABASES"]; - } - else { - listDBStatement = [NSString stringWithFormat:@"SHOW DATABASES LIKE %@", [dbsName backtickQuotedString]]; - } - DLog(@"running query : %@", listDBStatement); - MCPResult *theResult = [connection queryString:listDBStatement]; - - if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Failed to retrieve databases list", @"database list error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to retrieve a list of databases.\n\nMySQL said: %@", - @"database list error informative message"), - [connection getLastErrorMessage]]); - return NO; - } - - NSMutableArray *names = [NSMutableArray array]; - NSMutableString *name; - if ([theResult numOfRows] > 1) { - int i; - for ( i = 0 ; i < [theResult numOfRows] ; i++ ) { - name = [[theResult fetchRowAsArray] objectAtIndex:0]; - [names addObject:name]; - } - } - - return names; -} - -@end diff --git a/Source/SPDatabaseRename.h b/Source/SPDatabaseRename.h deleted file mode 100644 index bd52a86f..00000000 --- a/Source/SPDatabaseRename.h +++ /dev/null @@ -1,74 +0,0 @@ -// -// $Id$ -// -// SPDatabaseRename.h -// sequel-pro -// -// Created by David Rekowski on Apr 13, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - - -#import "SPDBActionCommons.h" -#import "SPDatabaseInfo.h" - -/** - * The SPDatabaseRename class povides functionality to rename a database. - */ -@interface SPDatabaseRename : SPDBActionCommons { - SPDatabaseInfo *dbInfo; -} - -/** - * @property SPDatabaseInfo an instance of the database info class - */ -@property (retain) SPDatabaseInfo *dbInfo; - -/** - * This method retrieves the dbInfo object if it exists; otherwise it is generated and the - * connection is passed to it. - * - * @result SPDatabaseInfo dbInfo object - */ -- (SPDatabaseInfo *)getDBInfoObject; - -/** - * This method renames an existing database. - * - * @param NSString sourceDatabaseName the name of the source database - * @param NSString targetDatabaseName the name of the target database - * @result BOOL success - */ -- (BOOL)renameDatabaseFrom: (NSString *)sourceDatabaseName to: (NSString *)targetDatabaseName; - -/** - * This method creates a new database. - * - * @param NSString newDatabaseName name of the new database to be created - * @return BOOL YES on success, otherwise NO - */ -- (BOOL) createDatabase: (NSString *)newDatabaseName; - -/** - * This method drops a database. - * - * @param NSString databaseName name of the database to drop - * @return BOOL YES on success, otherwise NO - */ -- (BOOL) dropDatabase: (NSString *)databaseName; - -@end diff --git a/Source/SPDatabaseRename.m b/Source/SPDatabaseRename.m deleted file mode 100644 index 26a983e5..00000000 --- a/Source/SPDatabaseRename.m +++ /dev/null @@ -1,127 +0,0 @@ -// -// $Id$ -// -// SPDatabaseRename.m -// sequel-pro -// -// Created by David Rekowski on Apr 13, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - - -#import "SPDBActionCommons.h" -#import "SPDatabaseRename.h" -#import "SPTableCopy.h" - -@implementation SPDatabaseRename - -@synthesize dbInfo; - -- (SPDatabaseInfo *)getDBInfoObject { - if (dbInfo != nil) { - return dbInfo; - } else { - dbInfo = [[SPDatabaseInfo alloc] init]; - [dbInfo setConnection:[self connection]]; - [dbInfo setMessageWindow:messageWindow]; - } - return dbInfo; -} - -- (BOOL)renameDatabaseFrom: (NSString *)sourceDatabaseName to: (NSString *)targetDatabaseName { - SPDatabaseInfo *databaseInfo = [self getDBInfoObject]; - - // check, whether the source database exists and the target database doesn't. - NSArray *tables = [NSArray array]; - BOOL sourceExists = [databaseInfo databaseExists:sourceDatabaseName]; - BOOL targetExists = [databaseInfo databaseExists:targetDatabaseName]; - if (sourceExists && !targetExists) { - // retrieve the list of tables/views/funcs/triggers from the source database - - tables = [connection listTablesFromDB:sourceDatabaseName]; - } else { - SPBeginAlertSheet(NSLocalizedString(@"Cannot create existing database", @"create database exists error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to create the target database.\n\nDatabase %@ already exists.", - @"create database error informative message"), - targetDatabaseName]); - return NO; - } - DLog(@"list of found tables of source db: %@", tables); - - BOOL success = [self createDatabase:targetDatabaseName]; - SPTableCopy *dbActionTableCopy = [[SPTableCopy alloc] init]; - [dbActionTableCopy setConnection:connection]; - - for (NSString *currentTable in tables) { - if ([dbActionTableCopy moveTable:currentTable - from:sourceDatabaseName - to:targetDatabaseName]) { - } else { - success = FALSE; - } - } - tables = [connection listTablesFromDB:sourceDatabaseName]; - if ([tables count] == 0) { - [self dropDatabase:sourceDatabaseName]; - } else { - SPBeginAlertSheet(NSLocalizedString(@"Failed to delete database", @"delete database error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"Database %@ not empty, skipping drop database.", - @"delete database not empty error informative message"), - sourceDatabaseName]); - } - return success; -} - -- (BOOL) createDatabase: (NSString *)newDatabaseName { - NSString *createStatement = [NSString stringWithFormat:@"CREATE DATABASE %@", - [newDatabaseName backtickQuotedString]]; - [connection queryString:createStatement]; - if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Failed to create database", @"create database error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to create a database.\n\nMySQL said: %@", - @"create database error informative message"), - [connection getLastErrorMessage]]); - return NO; - } - return YES; - -} - -- (BOOL) dropDatabase: (NSString *)databaseName { - NSString *dropStatement = [NSString stringWithFormat:@"DROP DATABASE %@", - [databaseName backtickQuotedString]]; - [connection queryString:dropStatement]; - if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Failed to drop database", @"drop database error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to drop a database.\n\nMySQL said: %@", - @"drop database error informative message"), - [connection getLastErrorMessage]]); - return NO; - } - return YES; - -} - -- (void)dealloc { - [dbInfo dealloc]; -} - -@end
\ No newline at end of file diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m index f272a3e5..d58e731e 100644 --- a/Source/SPExtendedTableInfo.m +++ b/Source/SPExtendedTableInfo.m @@ -238,7 +238,7 @@ [tableCreateSyntaxTextView setString:@""]; NSString *createViewSyntax = [[[tableDataInstance tableCreateSyntax] createViewSyntaxPrettifier] stringByAppendingString:@";"]; - + if (createViewSyntax) { [tableCreateSyntaxTextView shouldChangeTextInRange:NSMakeRange(0, 0) replacementString:createViewSyntax]; [tableCreateSyntaxTextView insertText:createViewSyntax]; @@ -282,7 +282,7 @@ NSArray *collations = [databaseDataInstance getDatabaseCollationsForEncoding:[tableDataInstance tableEncoding]]; if (([engines count] > 0) && ([statusFields objectForKey:@"Engine"])) { - + // Populate type popup button for (NSDictionary *engine in engines) { @@ -353,7 +353,7 @@ [tableCommentsTextView setString:[statusFields objectForKey:@"Comment"]]; [tableCommentsTextView didChangeText]; [tableCommentsTextView setEditable:enableInteraction]; - + // Set create syntax [tableCreateSyntaxTextView setEditable:YES]; [tableCreateSyntaxTextView shouldChangeTextInRange:NSMakeRange(0, [[tableCommentsTextView string] length]) replacementString:@""]; @@ -436,7 +436,7 @@ - (void)textDidEndEditing:(NSNotification *)notification { id object = [notification object]; - + if ((object == tableCommentsTextView) && ([object isEditable]) && ([selectedTable length] > 0)) { NSString *currentComment = [[tableDataInstance statusValueForKey:@"Comment"] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index a3d17f1c..ae935b44 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -82,13 +82,8 @@ { // Set source path - if([sourcePath hasPrefix:SPImportClipboardTempFileNamePrefix]) { - [fileSourcePath setURL:[NSURL fileURLWithPath:NSLocalizedString(@"Clipboard", @"Clipboard")]]; - } else { - [fileSourcePath setURL:[NSURL fileURLWithPath:sourcePath]]; - } + [fileSourcePath setURL:[NSURL fileURLWithPath:sourcePath]]; [fileSourcePath setDoubleAction:@selector(goBackToFileChooser:)]; - [onupdateTextView setDelegate:theDelegate]; windowMinWidth = [[self window] minSize].width; windowMinHeigth = [[self window] minSize].height; @@ -546,11 +541,7 @@ - (IBAction)goBackToFileChooser:(id)sender { [NSApp endSheet:[self window] returnCode:[sender tag]]; - if([sourcePath hasPrefix:SPImportClipboardTempFileNamePrefix]) { - [theDelegate importFromClipboard]; - } else { - [theDelegate importFile]; - } + [theDelegate importFile]; } #pragma mark - diff --git a/Source/SPFileHandle.h b/Source/SPFileHandle.h deleted file mode 100644 index 05e05dd5..00000000 --- a/Source/SPFileHandle.h +++ /dev/null @@ -1,102 +0,0 @@ -// -// $Id$ -// -// SPFileHandle.h -// sequel-pro -// -// Created by Rowan Beentje on April 5, 2010 -// Copyright (c) 2010 Rowan Beentje. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -/** - * Provides a class which aims to duplicate some of the most-used functionality - * of NSFileHandle, while also transparently supporting GZip-compressed content - * on reading; also supports GZip compression when writing. - */ - -#import <Cocoa/Cocoa.h> - -@interface SPFileHandle : NSObject { - void *wrappedFile; - char *wrappedFilePath; - - NSMutableData *buffer; - NSUInteger bufferDataLength; - NSUInteger bufferPosition; - BOOL endOfFile; - pthread_mutex_t bufferLock; - NSThread *processingThread; - - int fileMode; - BOOL dataWritten; - BOOL allDataWritten; - BOOL fileIsClosed; - BOOL useGzip; -} - - -#pragma mark - -#pragma mark Class methods - -+ (id) fileHandleForReadingAtPath:(NSString *)path; -+ (id) fileHandleForWritingAtPath:(NSString *)path; -+ (id) fileHandleForPath:(NSString *)path mode:(int)mode; - -#pragma mark - -#pragma mark Initialisation - -// Returns a file handle initialised with a file -- (id) initWithFile:(void *)theFile fromPath:(const char *)path mode:(int)mode; - - -#pragma mark - -#pragma mark Data reading - -// Reads data up to a specified number of bytes from the file -- (NSMutableData *) readDataOfLength:(NSUInteger)length; - -// Returns the data to the end of the file -- (NSMutableData *) readDataToEndOfFile; - -// Returns the on-disk (raw) length of data read so far - can be used in progress bars -- (NSUInteger) realDataReadLength; - -#pragma mark - -#pragma mark Data writing - -// Set whether data should be written as gzipped data (defaults to NO on a fresh object) -- (void) setShouldWriteWithGzipCompression:(BOOL)useGzip; - -// Write the provided data to the file -- (void) writeData:(NSData *)data; - -// Ensures any buffers are written to disk -- (void) synchronizeFile; - -// Prevents further access to the file -- (void) closeFile; - - -#pragma mark - -#pragma mark File information - -// Returns whether gzip compression is enabled on the file -- (BOOL) isCompressed; - - -@end diff --git a/Source/SPFileHandle.m b/Source/SPFileHandle.m deleted file mode 100644 index bceae2aa..00000000 --- a/Source/SPFileHandle.m +++ /dev/null @@ -1,343 +0,0 @@ -// -// $Id$ -// -// SPFileHandle.m -// sequel-pro -// -// Created by Rowan Beentje on April 5, 2010 -// Copyright (c) 2010 Rowan Beentje. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import "SPFileHandle.h" -#import "zlib.1.2.4.h" -#import "pthread.h" - -// Define the maximum size of the background write buffer before the writing thread -// waits until some has been written out. This can affect speed and memory usage. -#define SPFH_MAX_WRITE_BUFFER_SIZE 1048576 - -@interface SPFileHandle (PrivateAPI) -- (void) _writeBufferToData; -@end - - -@implementation SPFileHandle - -#pragma mark - -#pragma mark Setup and teardown - -/** - * Initialises and returns a SPFileHandle with a specified file (FILE or gzFile). - * "mode" indicates the file interaction mode - currently only read-only - * or write-only are supported. - * On reading, theFile should always be a gzFile; on writing, theFile is a FILE - * when compression is disabled, or a gzFile when enbled. - */ -- (id) initWithFile:(void *)theFile fromPath:(const char *)path mode:(int)mode -{ - if (self = [super init]) { - dataWritten = NO; - allDataWritten = YES; - fileIsClosed = NO; - - wrappedFile = theFile; - wrappedFilePath = malloc(strlen(path) + 1); - strcpy(wrappedFilePath, path); - - // Check and set the mode - fileMode = mode; - if (fileMode != O_RDONLY && fileMode != O_WRONLY) { - [NSException raise:NSInvalidArgumentException format:@"SPFileHandle only supports read-only and write-only file modes"]; - } - - // Instantiate the buffer - pthread_mutex_init(&bufferLock, NULL); - buffer = [[NSMutableData alloc] init]; - bufferDataLength = 0; - bufferPosition = 0; - endOfFile = NO; - - // If in read mode, set up the buffer - if (fileMode == O_RDONLY) { - gzbuffer(wrappedFile, 131072); - useGzip = !gzdirect(wrappedFile); - processingThread = nil; - - // In write mode, set up a thread to handle writing in the background - } else if (fileMode == O_WRONLY) { - useGzip = NO; - processingThread = [[NSThread alloc] initWithTarget:self selector:@selector(_writeBufferToData) object:nil]; - [processingThread start]; - } - } - - return self; -} - -- (void) dealloc -{ - [self closeFile]; - if (processingThread) [processingThread release]; - free(wrappedFilePath); - [buffer release]; - pthread_mutex_destroy(&bufferLock); - [super dealloc]; -} - -#pragma mark - -#pragma mark Class methods - -/** - * Retrieve and return a SPFileHandle for reading a file at the supplied - * path. Returns nil if the file could not be found or opened. - */ -+ (id) fileHandleForReadingAtPath:(NSString *)path -{ - return [self fileHandleForPath:path mode:O_RDONLY]; -} - -/** - * Retrieve and return a SPFileHandle for writing a file at the supplied - * path. Returns nil if the file could not be found or opened. - */ -+ (id) fileHandleForWritingAtPath:(NSString *)path -{ - return [self fileHandleForPath:path mode:O_WRONLY]; -} - -/** - * Retrieve and return a SPFileHandle for a file at the specified path, - * using the supplied file status flag. Returns nil if the file could - * not be found or opened. - */ -+ (id) fileHandleForPath:(NSString *)path mode:(int)mode -{ - - // Retrieves the path in a filesystem-appropriate format and encoding - const char *pathRepresentation = [path fileSystemRepresentation]; - if (!pathRepresentation) return nil; - - // Open the file to get a file descriptor, returning on failure - FILE *theFile; - const char *theMode; - if (mode == O_WRONLY) { - theMode = "wb"; - theFile = fopen(pathRepresentation, theMode); - } else { - theMode = "rb"; - theFile = gzopen(pathRepresentation, theMode); - } - if (theFile == NULL) return nil; - - // Return an autoreleased file handle - return [[[self alloc] initWithFile:theFile fromPath:pathRepresentation mode:mode] autorelease]; -} - - -#pragma mark - -#pragma mark Data reading - -/** - * Reads data up to a specified number of uncompressed bytes from the file. - */ -- (NSMutableData *) readDataOfLength:(NSUInteger)length -{ - void *theData = malloc(length); - long theDataLength = gzread(wrappedFile, theData, length); - return [NSMutableData dataWithBytesNoCopy:theData length:theDataLength freeWhenDone:YES]; -} - -/** - * Returns all the data to the end of the file. - */ -- (NSMutableData *) readDataToEndOfFile -{ - return [self readDataOfLength:NSUIntegerMax]; -} - -/** - * Returns the on-disk (raw/uncompressed) length of data read so far. - * This includes any compression headers within the data, and can be used - * for progress bars when processing files. - */ -- (NSUInteger) realDataReadLength -{ - if (fileMode == O_WRONLY) return 0; - return gzoffset(wrappedFile); -} - -#pragma mark - -#pragma mark Data writing - -/** - * Set whether data should be written as gzipped data, defaulting - * to NO on a fresh object. If this is called after data has been - * written, an exception is thrown. - */ -- (void) setShouldWriteWithGzipCompression:(BOOL)shouldUseGzip -{ - if (shouldUseGzip == useGzip) return; - - if (dataWritten) [NSException raise:NSInternalInconsistencyException format:@"Cannot change compression settings when data has already been written"]; - - if (shouldUseGzip) { - fclose(wrappedFile); - wrappedFile = gzopen(wrappedFilePath, "wb"); - gzbuffer(wrappedFile, 131072); - } else { - gzclose(wrappedFile); - wrappedFile = fopen(wrappedFilePath, "wb"); - } - useGzip = shouldUseGzip; -} - - -/** - * Write the supplied data to the file. The data may not be written to the - * disk at once (see synchronizeFile). - */ -- (void) writeData:(NSData *)data -{ - - // Throw an exception if the file is closed - if (fileIsClosed) [NSException raise:NSInternalInconsistencyException format:@"Cannot write to a file handle after it has been closed"]; - - // Add the data to the buffer - if ([data length]) { - pthread_mutex_lock(&bufferLock); - [buffer appendData:data]; - allDataWritten = NO; - bufferDataLength += [data length]; - } - - // If the buffer is large, wait for some to be written out - while (bufferDataLength > SPFH_MAX_WRITE_BUFFER_SIZE) { - pthread_mutex_unlock(&bufferLock); - usleep(100); - pthread_mutex_lock(&bufferLock); - } - pthread_mutex_unlock(&bufferLock); -} - -/** - * Blocks until all data has been written to disk. - */ -- (void) synchronizeFile -{ - pthread_mutex_lock(&bufferLock); - while (!allDataWritten) { - pthread_mutex_unlock(&bufferLock); - usleep(100); - pthread_mutex_lock(&bufferLock); - } - pthread_mutex_unlock(&bufferLock); -} - -/** - * Ensure all data is written out, close any file handles, and prevent any - * more data from being written to the file. - */ -- (void) closeFile -{ - if (!fileIsClosed) { - [self synchronizeFile]; - if (useGzip || fileMode == O_RDONLY) { - gzclose(wrappedFile); - } else { - fclose(wrappedFile); - } - if (processingThread) { - if ([processingThread isExecuting]) { - [processingThread cancel]; - while ([processingThread isExecuting]) usleep(100); - } - } - fileIsClosed = YES; - } -} - - -#pragma mark - -#pragma mark File information - -/** - * Returns whether gzip compression is enabled on the file. - */ -- (BOOL) isCompressed -{ - return useGzip; -} - -@end - -@implementation SPFileHandle (PrivateAPI) - -/** - * A method to be called on a background thread, allowing write data to build - * up in a buffer and write to disk in chunks as the buffer fills. This allows - * background compression of the data when using Gzip compression. - */ -- (void) _writeBufferToData -{ - NSAutoreleasePool *writePool = [[NSAutoreleasePool alloc] init]; - - // Process the buffer in a loop into the file, until cancelled - while (!fileIsClosed && ![processingThread isCancelled]) { - - // Check whether any data in the buffer needs to be written out - using thread locks for safety - pthread_mutex_lock(&bufferLock); - if (!bufferDataLength) { - pthread_mutex_unlock(&bufferLock); - usleep(1000); - continue; - } - - // Copy the data into a local buffer - NSData *dataToBeWritten = [NSData dataWithData:buffer]; - [buffer setLength:0]; - bufferDataLength = 0; - pthread_mutex_unlock(&bufferLock); - - // Write out the data - long bufferLengthWrittenOut; - if (useGzip) { - bufferLengthWrittenOut = gzwrite(wrappedFile, [dataToBeWritten bytes], [dataToBeWritten length]); - } else { - bufferLengthWrittenOut = fwrite([dataToBeWritten bytes], 1, [dataToBeWritten length], wrappedFile); - } - - // Restore data to the buffer if it wasn't written out - pthread_mutex_lock(&bufferLock); - if (bufferLengthWrittenOut < [dataToBeWritten length]) { - if ([buffer length]) { - long dataLengthToRestore = [dataToBeWritten length] - bufferLengthWrittenOut; - [buffer replaceBytesInRange:NSMakeRange(0, 0) withBytes:[[dataToBeWritten subdataWithRange:NSMakeRange(bufferLengthWrittenOut, dataLengthToRestore)] bytes] length:dataLengthToRestore]; - bufferDataLength += dataLengthToRestore; - } - - // Otherwise, mark all data as written if it has been - allows synching to hard disk. - } else if (![buffer length]) { - allDataWritten = YES; - } - pthread_mutex_unlock(&bufferLock); - } - - [writePool drain]; -} - -@end diff --git a/Source/SPHistoryController.m b/Source/SPHistoryController.m index 567ebd7a..a1d9de58 100644 --- a/Source/SPHistoryController.m +++ b/Source/SPHistoryController.m @@ -57,10 +57,10 @@ tableContentInstance = [theDocument valueForKey:@"tableContentInstance"]; tablesListInstance = [theDocument valueForKey:@"tablesListInstance"]; toolbarItemVisible = NO; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(toolbarWillAddItem:) name:NSToolbarWillAddItemNotification object:[theDocument valueForKey:@"mainToolbar"]]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(toolbarDidRemoveItem:) name:NSToolbarDidRemoveItemNotification object:[theDocument valueForKey:@"mainToolbar"]]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(startDocumentTask:) name:SPDocumentTaskStartNotification object:theDocument]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(endDocumentTask:) name:SPDocumentTaskEndNotification object:theDocument]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(toolbarWillAddItem:) name:NSToolbarWillAddItemNotification object:[theDocument valueForKey:@"mainToolbar"]]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(toolbarDidRemoveItem:) name:NSToolbarDidRemoveItemNotification object:[theDocument valueForKey:@"mainToolbar"]]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(startDocumentTask:) name:SPDocumentTaskStartNotification object:theDocument]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(endDocumentTask:) name:SPDocumentTaskEndNotification object:theDocument]; } - (void) dealloc @@ -80,9 +80,9 @@ - (void) updateToolbarItem { - // If the toolbar item isn't visible, don't perform any actions - as manipulating - // items not on the toolbar can cause crashes. - if (!toolbarItemVisible) return; + // If the toolbar item isn't visible, don't perform any actions - as manipulating + // items not on the toolbar can cause crashes. + if (!toolbarItemVisible) return; BOOL backEnabled = NO; BOOL forwardEnabled = NO; @@ -92,7 +92,7 @@ // Set the active state of the segments if appropriate if ([history count] && historyPosition > 0) backEnabled = YES; if ([history count] && historyPosition + 1 < [history count]) forwardEnabled = YES; - + [historyControl setEnabled:backEnabled forSegment:0]; [historyControl setEnabled:forwardEnabled forSegment:1]; @@ -196,13 +196,13 @@ */ - (void) setupInterface { - NSArray *toolbarItems = [[theDocument valueForKey:@"mainToolbar"] items]; - for (NSToolbarItem *toolbarItem in toolbarItems) { - if ([[toolbarItem itemIdentifier] isEqualToString:SPMainToolbarHistoryNavigation]) { - toolbarItemVisible = YES; - break; - } - } + NSArray *toolbarItems = [[theDocument valueForKey:@"mainToolbar"] items]; + for (NSToolbarItem *toolbarItem in toolbarItems) { + if ([[toolbarItem itemIdentifier] isEqualToString:SPMainToolbarHistoryNavigation]) { + toolbarItemVisible = YES; + break; + } + } } /** @@ -210,7 +210,7 @@ */ - (void) startDocumentTask:(NSNotification *)aNotification { - if (toolbarItemVisible) [historyControl setEnabled:NO]; + if (toolbarItemVisible) [historyControl setEnabled:NO]; } /** @@ -218,7 +218,7 @@ */ - (void) endDocumentTask:(NSNotification *)aNotification { - if (toolbarItemVisible) [historyControl setEnabled:YES]; + if (toolbarItemVisible) [historyControl setEnabled:YES]; } /** @@ -227,10 +227,10 @@ * can cause crashes. */ - (void) toolbarWillAddItem:(NSNotification *)aNotification { - if ([[[[aNotification userInfo] objectForKey:@"item"] itemIdentifier] isEqualToString:SPMainToolbarHistoryNavigation]) { - toolbarItemVisible = YES; - [self performSelector:@selector(updateToolbarItem) withObject:nil afterDelay:0.1]; - } + if ([[[[aNotification userInfo] objectForKey:@"item"] itemIdentifier] isEqualToString:SPMainToolbarHistoryNavigation]) { + toolbarItemVisible = YES; + [self performSelector:@selector(updateToolbarItem) withObject:nil afterDelay:0.1]; + } } /** @@ -239,9 +239,9 @@ * can cause crashes. */ - (void) toolbarDidRemoveItem:(NSNotification *)aNotification { - if ([[[[aNotification userInfo] objectForKey:@"item"] itemIdentifier] isEqualToString:SPMainToolbarHistoryNavigation]) { - toolbarItemVisible = NO; - } + if ([[[[aNotification userInfo] objectForKey:@"item"] itemIdentifier] isEqualToString:SPMainToolbarHistoryNavigation]) { + toolbarItemVisible = NO; + } } #pragma mark - diff --git a/Source/SPLogger.h b/Source/SPLogger.h index 4d394b83..ac9b9a04 100644 --- a/Source/SPLogger.h +++ b/Source/SPLogger.h @@ -27,53 +27,13 @@ @interface SPLogger : NSObject { - /** - * Dump leaks on termination flag. - */ - BOOL dumpLeaksOnTermination; - - /** - * Remove old leak dumps on termination flag. - */ - BOOL removeOldLeakDumpsOnTermination; - - /** - * Log file initialized successfully flag. - */ BOOL initializedSuccessfully; - - /** - * Log file handle. - */ NSFileHandle *logFileHandle; } -/** - * Returns the shared logger. - * - * @return The logger instance - */ + (SPLogger *)logger; -@property(readwrite, assign) BOOL dumpLeaksOnTermination; -@property(readwrite, assign) BOOL removeOldLeakDumpsOnTermination; - -/** - * Dumps the result of running leaks to the file '/tmp/sp.leaks.<pid>.tmp'. - * - * Note, that to enable useful output, make sure the following environment variables are set to YES: - * - * MallocStackLogging - * MallocStackLoggingNoCompact - * - * Also note that the application may take a while to terminate if it has been running for a significant - * period of time or has been handling large amounts of data. - */ -- (void)dumpLeaks; - -/** - * Logs the supplied string to the log file. - */ -- (void)log:(NSString *)theString, ...; +- (void) outputTimeString; +- (void) log:(NSString *)theString, ...; @end diff --git a/Source/SPLogger.m b/Source/SPLogger.m index 83c5b49c..d492fe32 100644 --- a/Source/SPLogger.m +++ b/Source/SPLogger.m @@ -25,21 +25,8 @@ #import "SPLogger.h" -#include <pwd.h> -#include <stdio.h> -#include <dirent.h> -#include <sys/dir.h> -#include <sys/types.h> - static SPLogger *logger = nil; -@interface SPLogger (PrivateAPI) - -- (void)_initLogFile; -- (void)_outputTimeString; - -@end - /** * This is a small class intended to aid in user issue debugging; by including * the header file, and using [[SPLogger logger] log:@"String with format", ...] @@ -53,9 +40,6 @@ static SPLogger *logger = nil; @implementation SPLogger -@synthesize dumpLeaksOnTermination; -@synthesize removeOldLeakDumpsOnTermination; - /* * Returns the shared logger object. */ @@ -93,10 +77,41 @@ static SPLogger *logger = nil; - (id)init { if ((self = [super init])) { + NSArray *paths = NSSearchPathForDirectoriesInDomains (NSDesktopDirectory, NSUserDomainMask, YES); + NSString *logFilePath = [NSString stringWithFormat:@"%@/Sequel Pro Debug Log.txt", [paths objectAtIndex:0]]; + initializedSuccessfully = YES; - [self setDumpLeaksOnTermination:NO]; - [self setRemoveOldLeakDumpsOnTermination:YES]; + // Check if the debug file exists, and is writable + if ( [[NSFileManager defaultManager] fileExistsAtPath:logFilePath] ) { + if ( ![[NSFileManager defaultManager] isWritableFileAtPath:logFilePath] ) { + initializedSuccessfully = NO; + NSRunAlertPanel(@"Logging error", @"Log file exists but is not writeable; no debug log will be generated!", @"OK", nil, nil); + } + + // Otherwise try creating one + } else { + if ( ![[NSFileManager defaultManager] createFileAtPath:logFilePath contents:[NSData data] attributes:nil] ) { + initializedSuccessfully = NO; + NSRunAlertPanel(@"Logging error", @"Could not create log file for writing; no debug log will be generated!", @"OK", nil, nil); + } + } + + // Get a file handle to the file if possible + if (initializedSuccessfully) { + logFileHandle = [NSFileHandle fileHandleForWritingAtPath:logFilePath]; + if (!logFileHandle) { + initializedSuccessfully = NO; + NSRunAlertPanel(@"Logging error", @"Could not open log file for writing; no debug log will be generated!", @"OK", nil, nil); + } else { + [logFileHandle retain]; + [logFileHandle seekToEndOfFile]; + NSString *bundleName = [[NSFileManager defaultManager] displayNameAtPath:[[NSBundle mainBundle] bundlePath]]; + NSMutableString *logStart = [NSMutableString stringWithString:@"\n\n\n==========================================================================\n\n"]; + [logStart appendString:[NSString stringWithFormat:@"%@ (r%ld)\n", bundleName, (long)[[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] integerValue]]]; + [logFileHandle writeData:[logStart dataUsingEncoding:NSUTF8StringEncoding]]; + } + } } return self; @@ -105,11 +120,9 @@ static SPLogger *logger = nil; #pragma mark - #pragma mark Logging functions -- (void)log:(NSString *)theString, ... +- (void) log:(NSString *)theString, ... { if (!initializedSuccessfully) return; - - if (!logFileHandle) [self _initLogFile]; // Extract any supplied arguments and build the formatted log string va_list arguments; @@ -118,138 +131,16 @@ static SPLogger *logger = nil; va_end(arguments); // Write the log line, forcing an immediate write to disk to ensure logging - [logFileHandle writeData:[[NSString stringWithFormat:@"%@ %@\n", [[NSDate date] descriptionWithCalendarFormat:@"%H:%M:%S" timeZone:nil locale:[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]], logString] dataUsingEncoding:NSUTF8StringEncoding]]; + [logFileHandle writeData:[[NSString stringWithFormat:@"%@ %@\n", [[NSDate date] descriptionWithCalendarFormat:@"%H:%M:%S" timeZone:nil locale:[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]], logString] dataUsingEncoding:NSUTF8StringEncoding]]; [logFileHandle synchronizeFile]; [logString release]; } -- (void)dumpLeaks -{ - if ([self dumpLeaksOnTermination]) { - - char *lgn; - struct passwd *pw; - boolean_t hdir = FALSE; - - // Determine where to write the log to - if ((lgn = getlogin()) == NULL || (pw = getpwnam(lgn)) == NULL) { - fprintf(stderr, "Unable to get user info, falling back to /tmp\n"); - } - else { - hdir = TRUE; - } - - // If required remove old logs - if ([self removeOldLeakDumpsOnTermination]) { - - int cnt, cnt2, i; - int isSPLeaksLog(); - struct direct **files; - - cnt = scandir("/tmp", &files, isSPLeaksLog, NULL); - - char fpath[32], fpath2[32], fpath3[64]; - - for (i = 0; i < cnt; i++) - { - snprintf(fpath, sizeof(fpath), "/tmp/%s", files[i]->d_name); - - if (remove(fpath) != 0) { - printf("Unable to remove Sequel Pro leaks log '%s'\n", files[i]->d_name); - } - } - - free(&files); - - if (hdir) { - snprintf(fpath2, sizeof(fpath2), "%s/Desktop", pw->pw_dir); - - cnt2 = scandir(fpath2, &files, isSPLeaksLog, NULL); - - for (i = 0; i < cnt2; i++) - { - snprintf(fpath3, sizeof(fpath3), "%s/%s", fpath2, files[i]->d_name); - - if (remove(fpath3) != 0) { - printf("Unable to remove Sequel Pro leaks log '%s'\n", files[i]->d_name); - } - } - } - } - - size_t len; - FILE *fp, *fp2; - char cmd[32], file[64], buf[512]; - - snprintf(cmd, sizeof(cmd), "/usr/bin/leaks %d", getpid()); - snprintf(file, sizeof(file), (hdir) ? "%s/Desktop/sp.leaks.%d.log" : "%s/sp.leaks.%d.log", (hdir) ? pw->pw_dir : "/tmp", getpid()); - - // Write new leaks log - if ((fp = popen(cmd, "r")) && (fp2 = fopen(file, "w"))) { - - while (len = fread(buf, 1, sizeof(buf), fp)) - { - fwrite(buf, 1, len, fp2); - } - - pclose(fp); - } - } -} - -int isSPLeaksLog(struct direct *entry) -{ - return (strstr(entry->d_name, "sp.leaks") != NULL); -} - -- (void)_initLogFile -{ - NSArray *paths = NSSearchPathForDirectoriesInDomains (NSDesktopDirectory, NSUserDomainMask, YES); - NSString *logFilePath = [NSString stringWithFormat:@"%@/Sequel Pro Debug Log.log", [paths objectAtIndex:0]]; - - NSFileManager *fileManager = [NSFileManager defaultManager]; - - // Check if the debug file exists, and is writable - if ([fileManager fileExistsAtPath:logFilePath]) { - if (![fileManager isWritableFileAtPath:logFilePath]) { - initializedSuccessfully = NO; - NSRunAlertPanel(@"Logging error", @"Log file exists but is not writeable; no debug log will be generated!", @"OK", nil, nil); - } - // Otherwise try creating one - } - else { - if (![fileManager createFileAtPath:logFilePath contents:[NSData data] attributes:nil]) { - initializedSuccessfully = NO; - NSRunAlertPanel(@"Logging error", @"Could not create log file for writing; no debug log will be generated!", @"OK", nil, nil); - } - } - - // Get a file handle to the file if possible - if (initializedSuccessfully) { - logFileHandle = [NSFileHandle fileHandleForWritingAtPath:logFilePath]; - - if (!logFileHandle) { - initializedSuccessfully = NO; - NSRunAlertPanel(@"Logging error", @"Could not open log file for writing; no debug log will be generated!", @"OK", nil, nil); - } - else { - [logFileHandle retain]; - [logFileHandle seekToEndOfFile]; - - NSString *bundleName = [fileManager displayNameAtPath:[[NSBundle mainBundle] bundlePath]]; - NSMutableString *logStart = [NSMutableString stringWithString:@"\n\n\n==========================================================================\n\n"]; - - [logStart appendString:[NSString stringWithFormat:@"%@ (r%ld)\n", bundleName, (long)[[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] integerValue]]]; - [logFileHandle writeData:[logStart dataUsingEncoding:NSUTF8StringEncoding]]; - } - } -} - -- (void)_outputTimeString +- (void) outputTimeString { if (!initializedSuccessfully) return; - + [logFileHandle writeData:[[NSString stringWithFormat:@"Launched at %@\n\n", [[NSDate date] description]] dataUsingEncoding:NSUTF8StringEncoding]]; } diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m index 668e01c1..1ac2118c 100644 --- a/Source/SPNarrowDownCompletion.m +++ b/Source/SPNarrowDownCompletion.m @@ -75,6 +75,7 @@ }; unichar keyCode = 0; + if([anEvent type] == NSKeyDown && [[anEvent characters] length] == 1) keyCode = [[anEvent characters] characterAtIndex:0]; @@ -90,6 +91,7 @@ } else { [self selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO]; } + [self scrollRowToVisible:row]; return YES; } @@ -153,7 +155,7 @@ [mutablePrefix release]; [textualInputCharacters release]; [originalFilterString release]; - if(syncArrowImages) [syncArrowImages release]; + if (syncArrowImages) [syncArrowImages release]; if(suggestions) [suggestions release]; if (filtered) [filtered release]; @@ -408,13 +410,12 @@ } return @""; } else if([[aTableColumn identifier] isEqualToString:@"name"]) { - if(isQueryingDatabaseStructure && rowIndex == 0) + if(isQueryingDatabaseStructure && rowIndex == 0) return NSLocalizedString(@"fetching database structure in progress", @"fetching database structure in progress"); return [[filtered objectAtIndex:rowIndex] objectForKey:@"display"]; - } else if ([[aTableColumn identifier] isEqualToString:@"list"] || [[aTableColumn identifier] isEqualToString:@"type"]) { - if(isQueryingDatabaseStructure && rowIndex == 0) + if(isQueryingDatabaseStructure && rowIndex == 0) return NSLocalizedString(@"fetching database structure data in progress", @"fetching database structure data in progress"); if(dictMode) { @@ -435,7 +436,7 @@ } } else if ([[aTableColumn identifier] isEqualToString:@"path"]) { - if(isQueryingDatabaseStructure && rowIndex == 0) + if(isQueryingDatabaseStructure && rowIndex == 0) return NSLocalizedString(@"fetching database structure in progress", @"fetching database structure in progress"); if(dictMode) { @@ -608,7 +609,7 @@ { NSMutableArray* newFiltered = [[NSMutableArray alloc] initWithCapacity:5]; - + if([mutablePrefix length] > 0) { if(dictMode) { @@ -768,10 +769,10 @@ if(!event) continue; - + // Exit if closeMe has been set in the meantime if(closeMe) return; - + NSEventType t = [event type]; if([theTableView SP_NarrowDownCompletion_canHandleEvent:event]) { @@ -787,15 +788,15 @@ if (([event modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask)) == NSAlternateKeyMask || [[event characters] length] == 0) { if(autoCompletionMode) { - if(commonPrefixWasInsertedByAutoComplete) { - [theView setSelectedRange:theCharRange]; - [theView insertText:originalFilterString]; - [theView setCompletionIsOpen:NO]; - [self close]; - [NSApp sendEvent:event]; - break; - } - } + if(commonPrefixWasInsertedByAutoComplete) { + [theView setSelectedRange:theCharRange]; + [theView insertText:originalFilterString]; + [theView setCompletionIsOpen:NO]; + [self close]; + [NSApp sendEvent:event]; + break; + } + } [NSApp sendEvent: event]; if(commaInsertionMode) @@ -819,14 +820,14 @@ [self filter]; } else { if(autoCompletionMode) { - if(commonPrefixWasInsertedByAutoComplete) { - [theView setSelectedRange:theCharRange]; - [theView insertText:originalFilterString]; - } - [theView setCompletionIsOpen:NO]; - [self close]; - break; - } + if(commonPrefixWasInsertedByAutoComplete) { + [theView setSelectedRange:theCharRange]; + [theView insertText:originalFilterString]; + } + [theView setCompletionIsOpen:NO]; + [self close]; + break; + } if(cursorMovedLeft) [theView performSelector:@selector(moveRight:)]; break; } @@ -838,13 +839,13 @@ else if(key == NSBackspaceCharacter || key == NSDeleteCharacter) { if(autoCompletionMode) { - if(commonPrefixWasInsertedByAutoComplete) { - [theView setSelectedRange:theCharRange]; - [theView insertText:originalFilterString]; - } - [NSApp sendEvent:event]; - break; - } + if(commonPrefixWasInsertedByAutoComplete) { + [theView setSelectedRange:theCharRange]; + [theView insertText:originalFilterString]; + } + [NSApp sendEvent:event]; + break; + } [NSApp sendEvent:event]; if([mutablePrefix length] == 0 || commaInsertionMode) break; @@ -858,16 +859,16 @@ else if([textualInputCharacters characterIsMember:key]) { - if(autoCompletionMode) { - [theView setCompletionIsOpen:NO]; - [self close]; - if(commonPrefixWasInsertedByAutoComplete) { - [theView setSelectedRange:theCharRange]; - [theView insertText:originalFilterString]; - } - [NSApp sendEvent:event]; - return; - } + if(autoCompletionMode) { + [theView setCompletionIsOpen:NO]; + [self close]; + if(commonPrefixWasInsertedByAutoComplete) { + [theView setSelectedRange:theCharRange]; + [theView insertText:originalFilterString]; + } + [NSApp sendEvent:event]; + return; + } [NSApp sendEvent:event]; @@ -897,11 +898,11 @@ } else { if(!NSPointInRect([NSEvent mouseLocation], [self frame])) { if(autoCompletionMode) { - if(commonPrefixWasInsertedByAutoComplete) { - [theView setSelectedRange:theCharRange]; - [theView insertText:originalFilterString]; - } - } + if(commonPrefixWasInsertedByAutoComplete) { + [theView setSelectedRange:theCharRange]; + [theView insertText:originalFilterString]; + } + } if(cursorMovedLeft) [theView performSelector:@selector(moveRight:)]; [NSApp sendEvent:event]; break; diff --git a/Source/SPNotLoaded.h b/Source/SPNotLoaded.h index 25c4810c..611a3f91 100644 --- a/Source/SPNotLoaded.h +++ b/Source/SPNotLoaded.h @@ -36,4 +36,4 @@ - (BOOL) isSPNotLoaded; -@end +@end
\ No newline at end of file diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index e27c9b05..080a319f 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -346,11 +346,11 @@ - (IBAction)removeFavorite:(id)sender { if ([favoritesTableView numberOfSelectedRows] == 1) { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Delete favorite '%@'?", @"delete database message"), [favoritesController valueForKeyPath:@"selection.name"]] - defaultButton:NSLocalizedString(@"Delete", @"delete button") - alternateButton:NSLocalizedString(@"Cancel", @"cancel button") - otherButton:nil - informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the favorite '%@'? This operation cannot be undone.", @"delete database informative message"), [favoritesController valueForKeyPath:@"selection.name"]]]; + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Remove favorite '%@'?", @"remove database message"), [favoritesController valueForKeyPath:@"selection.name"]] + defaultButton:NSLocalizedString(@"Remove", @"remove button") + alternateButton:NSLocalizedString(@"Cancel", @"cancel button") + otherButton:nil + informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to remove the favorite '%@'? This operation cannot be undone.", @"remove database informative message"), [favoritesController valueForKeyPath:@"selection.name"]]]; NSArray *buttons = [alert buttons]; @@ -995,49 +995,49 @@ - (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo { - // Order out current sheet to suppress overlapping of sheets - if ([sheet respondsToSelector:@selector(orderOut:)]) + // Order out current sheet to suppress overlapping of sheets + if ([sheet respondsToSelector:@selector(orderOut:)]) [sheet orderOut:nil]; - else if ([sheet respondsToSelector:@selector(window)]) - [[sheet window] orderOut:nil]; - - // Remove the current database - if ([contextInfo isEqualToString:@"removeFavorite"]) { - if (returnCode == NSAlertDefaultReturn) { - - // Get selected favorite's details - NSString *name = [favoritesController valueForKeyPath:@"selection.name"]; - NSString *user = [favoritesController valueForKeyPath:@"selection.user"]; - NSString *host = [favoritesController valueForKeyPath:@"selection.host"]; - NSString *database = [favoritesController valueForKeyPath:@"selection.database"]; - NSString *sshUser = [favoritesController valueForKeyPath:@"selection.sshUser"]; - NSString *sshHost = [favoritesController valueForKeyPath:@"selection.sshHost"]; - NSString *favoriteid = [favoritesController valueForKeyPath:@"selection.id"]; - NSInteger type = [[favoritesController valueForKeyPath:@"selection.type"] integerValue]; - - // Remove passwords from the Keychain - [keychain deletePasswordForName:[keychain nameForFavoriteName:name id:favoriteid] - account:[keychain accountForUser:user host:((type == SPSocketConnection)?@"localhost":host) database:database]]; - [keychain deletePasswordForName:[keychain nameForSSHForFavoriteName:name id:favoriteid] - account:[keychain accountForSSHUser:sshUser sshHost:sshHost]]; - - // Reset last used favorite - if ([favoritesTableView selectedRow] == [prefs integerForKey:SPLastFavoriteIndex]) { - [prefs setInteger:0 forKey:SPLastFavoriteIndex]; - } - - // Reset default favorite - if ([favoritesTableView selectedRow] == [prefs integerForKey:SPDefaultFavorite]) { - [prefs setInteger:[prefs integerForKey:SPLastFavoriteIndex] forKey:SPDefaultFavorite]; - } - - [favoritesController removeObjectAtArrangedObjectIndex:[favoritesTableView selectedRow]]; - - [favoritesTableView reloadData]; - - [self updateDefaultFavoritePopup]; - } - } + else if ([sheet respondsToSelector:@selector(window)]) + [[sheet window] orderOut:nil]; + + // Remove the current database + if ([contextInfo isEqualToString:@"removeFavorite"]) { + if (returnCode == NSAlertDefaultReturn) { + + // Get selected favorite's details + NSString *name = [favoritesController valueForKeyPath:@"selection.name"]; + NSString *user = [favoritesController valueForKeyPath:@"selection.user"]; + NSString *host = [favoritesController valueForKeyPath:@"selection.host"]; + NSString *database = [favoritesController valueForKeyPath:@"selection.database"]; + NSString *sshUser = [favoritesController valueForKeyPath:@"selection.sshUser"]; + NSString *sshHost = [favoritesController valueForKeyPath:@"selection.sshHost"]; + NSString *favoriteid = [favoritesController valueForKeyPath:@"selection.id"]; + NSInteger type = [[favoritesController valueForKeyPath:@"selection.type"] integerValue]; + + // Remove passwords from the Keychain + [keychain deletePasswordForName:[keychain nameForFavoriteName:name id:favoriteid] + account:[keychain accountForUser:user host:((type == SPSocketConnection)?@"localhost":host) database:database]]; + [keychain deletePasswordForName:[keychain nameForSSHForFavoriteName:name id:favoriteid] + account:[keychain accountForSSHUser:sshUser sshHost:sshHost]]; + + // Reset last used favorite + if ([favoritesTableView selectedRow] == [prefs integerForKey:SPLastFavoriteIndex]) { + [prefs setInteger:0 forKey:SPLastFavoriteIndex]; + } + + // Reset default favorite + if ([favoritesTableView selectedRow] == [prefs integerForKey:SPDefaultFavorite]) { + [prefs setInteger:[prefs integerForKey:SPLastFavoriteIndex] forKey:SPDefaultFavorite]; + } + + [favoritesController removeObjectAtArrangedObjectIndex:[favoritesTableView selectedRow]]; + + [favoritesTableView reloadData]; + + [self updateDefaultFavoritePopup]; + } + } } - (void)setGrowlEnabled:(BOOL)value @@ -1083,9 +1083,9 @@ // Add item to switch to edit favorites pane [[defaultFavoritePopup menu] addItem:[NSMenuItem separatorItem]]; - [defaultFavoritePopup addItemWithTitle:NSLocalizedString(@"Edit Favorites…", @"edit favorites menu item")]; - [[[defaultFavoritePopup menu] itemWithTitle:NSLocalizedString(@"Edit Favorites…", @"edit favorites menu item")] setAction:@selector(displayFavoritePreferences:)]; - [[[defaultFavoritePopup menu] itemWithTitle:NSLocalizedString(@"Edit Favorites…", @"edit favorites menu item")] setTarget:self]; + [defaultFavoritePopup addItemWithTitle:@"Edit Favorites…"]; + [[[defaultFavoritePopup menu] itemWithTitle:@"Edit Favorites…"] setAction:@selector(displayFavoritePreferences:)]; + [[[defaultFavoritePopup menu] itemWithTitle:@"Edit Favorites…"] setTarget:self]; // Select the default favorite from prefs if (![prefs boolForKey:SPSelectLastFavoriteUsed]) { diff --git a/Source/SPProcessListController.h b/Source/SPProcessListController.h index be095d40..5283c417 100644 --- a/Source/SPProcessListController.h +++ b/Source/SPProcessListController.h @@ -32,36 +32,26 @@ BOOL showFullProcessList; - NSTimer *autoRefreshTimer; - NSUserDefaults *prefs; NSMutableArray *processes, *processesFiltered; - IBOutlet NSWindow *customIntervalWindow; - IBOutlet NSTextField *customIntervalTextField; - IBOutlet NSButton *customIntervalButton; IBOutlet NSTableView *processListTableView; IBOutlet NSTextField *processesCountTextField; IBOutlet NSSearchField *filterProcessesSearchField; IBOutlet NSProgressIndicator *refreshProgressIndicator; IBOutlet NSButton *saveProcessesButton; IBOutlet NSButton *refreshProcessesButton; - IBOutlet NSButton *autoRefreshButton; - IBOutlet NSMenuItem *autoRefreshIntervalMenuItem; } @property (readwrite, assign) MCPConnection *connection; - (IBAction)copy:(id)sender; -- (IBAction)closeSheet:(id)sender; - (IBAction)refreshProcessList:(id)sender; - (IBAction)saveServerProcesses:(id)sender; - (IBAction)killProcessQuery:(id)sender; - (IBAction)killProcessConnection:(id)sender; - (IBAction)toggleShowProcessID:(id)sender; -- (IBAction)toggleProcessListAutoRefresh:(id)sender; -- (IBAction)setAutoRefreshInterval:(id)sender; -- (IBAction)setCustomAutoRefreshInterval:(id)sender; +- (IBAction)toggeleShowFullProcessList:(id)sender; - (void)displayProcessListWindow; diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m index 07c67247..0d4c653d 100644 --- a/Source/SPProcessListController.m +++ b/Source/SPProcessListController.m @@ -33,13 +33,7 @@ @interface SPProcessListController (PrivateAPI) -- (void)_processListRefreshed; -- (void)_startAutoRefreshTimer; -- (void)_killAutoRefreshTimer; -- (void)_fireAutoRefresh:(NSTimer *)timer; -- (void)_updateSelectedAutoRefreshIntervalInterface; -- (void)_startAutoRefreshTimerWithInterval:(NSTimeInterval)interval; -- (void)_getDatabaseProcessListInBackground:(id)object; +- (void)_getDatabaseProcessList; - (void)_killProcessQueryWithId:(NSUInteger)processId; - (void)_killProcessConnectionWithId:(NSUInteger)processId; - (void)_updateServerProcessesFilterForFilterString:(NSString *)filterString; @@ -50,20 +44,18 @@ @synthesize connection; -#pragma mark - -#pragma mark Initialisation - /** * Initialisation */ - (id)init { if ((self = [super initWithWindowNibName:@"DatabaseProcessList"])) { - - autoRefreshTimer = nil; processes = [[NSMutableArray alloc] init]; prefs = [NSUserDefaults standardUserDefaults]; + + // Default the process list comment to SHOW FULL PROCESSLIST + showFullProcessList = [prefs boolForKey:SPProcessListShowFullProcessList]; } return self; @@ -96,15 +88,6 @@ [prefs addObserver:self forKeyPath:SPUseMonospacedFonts options:NSKeyValueObservingOptionNew context:NULL]; } -/** - * Interface loading - */ -- (void)windowDidLoad -{ - // Update the selected auto refresh interval - [self _updateSelectedAutoRefreshIntervalInterface]; -} - #pragma mark - #pragma mark IBAction methods @@ -153,27 +136,16 @@ } /** - * Close the current sheet + * Close the process list sheet. */ -- (IBAction)closeSheet:(id)sender +- (void)close { - [NSApp endSheet:[sender window] returnCode:[sender tag]]; - [[sender window] orderOut:self]; -} - -/** - * If required start the auto refresh timer. - */ -- (void)showWindow:(id)sender -{ - // If the auto refresh option is enable start the timer - if ([prefs boolForKey:SPProcessListEnableAutoRefresh]) { - - // Start the auto refresh time but by pass the interface updates - [self _startAutoRefreshTimer]; + // If the filtered array is allocated and it's not a reference to the processes array get rid of it + if ((processesFiltered) && (processesFiltered != processes)) { + [processesFiltered release], processesFiltered = nil; } - [super showWindow:sender]; + [super close]; } /** @@ -193,9 +165,24 @@ [refreshProcessesButton setEnabled:NO]; [saveProcessesButton setEnabled:NO]; [filterProcessesSearchField setEnabled:NO]; - - // Get the processes list on a background thread - [NSThread detachNewThreadSelector:@selector(_getDatabaseProcessListInBackground:) toTarget:self withObject:nil]; + + [self _getDatabaseProcessList]; + + // Reapply any filters is required + if ([[filterProcessesSearchField stringValue] length] > 0) { + [self _updateServerProcessesFilterForFilterString:[filterProcessesSearchField stringValue]]; + } + + [processListTableView reloadData]; + + // Enable controls + [filterProcessesSearchField setEnabled:YES]; + [saveProcessesButton setEnabled:YES]; + [refreshProcessesButton setEnabled:YES]; + + // Stop progress Indicator + [refreshProgressIndicator stopAnimation:self]; + [refreshProgressIndicator setHidden:YES]; } /** @@ -269,7 +256,7 @@ } /** - * Toggles the display of the process ID table column. + * */ - (IBAction)toggleShowProcessID:(id)sender { @@ -277,38 +264,13 @@ } /** - * Toggles whether or not auto refresh is enabled. - */ -- (IBAction)toggleProcessListAutoRefresh:(id)sender -{ - BOOL enable = [sender state]; - - // Enable/Disable the refresh button - [refreshProcessesButton setEnabled:(!enable)]; - - (enable) ? [self _startAutoRefreshTimer] : [self _killAutoRefreshTimer]; -} - -/** - * Changes the auto refresh time interval based on the selected item - */ -- (IBAction)setAutoRefreshInterval:(id)sender -{ - [self _startAutoRefreshTimerWithInterval:[sender tag]]; -} - -/** * */ -- (IBAction)setCustomAutoRefreshInterval:(id)sender +- (IBAction)toggeleShowFullProcessList:(id)sender { - [customIntervalTextField setStringValue:[prefs stringForKey:SPProcessListAutoRrefreshInterval]]; - - [NSApp beginSheet:customIntervalWindow - modalForWindow:[self window] - modalDelegate:self - didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + showFullProcessList = (!showFullProcessList); + + [self refreshProcessList:self]; } #pragma mark - @@ -333,29 +295,19 @@ - (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo { // Order out current sheet to suppress overlapping of sheets - if ([sheet respondsToSelector:@selector(orderOut:)]) { + if ([sheet respondsToSelector:@selector(orderOut:)]) [sheet orderOut:nil]; - } - else if ([sheet respondsToSelector:@selector(window)]) { + else if ([sheet respondsToSelector:@selector(window)]) [[sheet window] orderOut:nil]; - } if (returnCode == NSAlertDefaultReturn) { + NSUInteger processId = [[[processes objectAtIndex:[processListTableView selectedRow]] valueForKey:@"Id"] integerValue]; - if (sheet == customIntervalWindow) { - NSLog(@"Set custom value to: %d", [customIntervalTextField integerValue]); - - [self _startAutoRefreshTimerWithInterval:[customIntervalTextField integerValue]]; + if ([contextInfo isEqualToString:SPKillProcessQueryMode]) { + [self _killProcessQueryWithId:processId]; } - else { - NSUInteger processId = [[[processes objectAtIndex:[processListTableView selectedRow]] valueForKey:@"Id"] integerValue]; - - if ([contextInfo isEqualToString:SPKillProcessQueryMode]) { - [self _killProcessQueryWithId:processId]; - } - else if ([contextInfo isEqualToString:SPKillProcessConnectionMode]) { - [self _killProcessConnectionWithId:processId]; - } + else if ([contextInfo isEqualToString:SPKillProcessConnectionMode]) { + [self _killProcessConnectionWithId:processId]; } } } @@ -405,10 +357,6 @@ return ([processListTableView numberOfSelectedRows] == 1); } - if ((action == @selector(setAutoRefreshInterval:)) || (action == @selector(setCustomAutoRefreshInterval:))) { - return [prefs boolForKey:SPProcessListEnableAutoRefresh]; - } - return YES; } @@ -460,7 +408,7 @@ - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { id object = (row < [processesFiltered count]) ? [[processesFiltered objectAtIndex:row] valueForKey:[tableColumn identifier]] : @""; - + return (![object isNSNull]) ? object : [prefs stringForKey:SPNullValue]; } @@ -477,26 +425,6 @@ if (object == filterProcessesSearchField) { [self _updateServerProcessesFilterForFilterString:[object stringValue]]; } - else if (object == customIntervalTextField) { - [customIntervalButton setEnabled:(([[customIntervalTextField stringValue] length] > 0) && ([customIntervalTextField integerValue] > 0))]; - } -} - -#pragma mark - -#pragma mark Window delegate methods - -/** - * Kill the auto refresh timer if it's running. - */ -- (void)windowWillClose:(NSNotification *)notification -{ - // If the filtered array is allocated and it's not a reference to the processes array get rid of it - if ((processesFiltered) && (processesFiltered != processes)) { - [processesFiltered release], processesFiltered = nil; - } - - // Kill the auto refresh timer if running - [self _killAutoRefreshTimer]; } #pragma mark - @@ -510,139 +438,33 @@ [processes release], processes = nil; - if (autoRefreshTimer) [autoRefreshTimer release], autoRefreshTimer = nil; - [super dealloc]; } -#pragma mark - -#pragma mark Private API - -/** - * Called by the background thread on the main thread once it has completed getting the list of processes. - */ -- (void)_processListRefreshed -{ - // Reapply any filters is required - if ([[filterProcessesSearchField stringValue] length] > 0) { - [self _updateServerProcessesFilterForFilterString:[filterProcessesSearchField stringValue]]; - } - - [processListTableView reloadData]; - - // Enable controls - [filterProcessesSearchField setEnabled:YES]; - [saveProcessesButton setEnabled:YES]; - [refreshProcessesButton setEnabled:(![autoRefreshButton state])]; - - // Stop progress Indicator - [refreshProgressIndicator stopAnimation:self]; - [refreshProgressIndicator setHidden:YES]; -} +@end -/** - * Starts the auto refresh timer. - */ -- (void)_startAutoRefreshTimer -{ - autoRefreshTimer = [[NSTimer scheduledTimerWithTimeInterval:[prefs doubleForKey:SPProcessListAutoRrefreshInterval] target:self selector:@selector(_fireAutoRefresh:) userInfo:nil repeats:YES] retain]; -} +@implementation SPProcessListController (PrivateAPI) /** - * Kills the auto refresh timer. + * Gets the current process list form the database; */ -- (void)_killAutoRefreshTimer +- (void)_getDatabaseProcessList { - // If the auto refresh timer is running, kill it - if (autoRefreshTimer && [autoRefreshTimer isValid]) { - [autoRefreshTimer invalidate]; - [autoRefreshTimer release], autoRefreshTimer = nil; - } -} - -/** - * Refreshes the process list when called by the auto refesh timer. - */ -- (void)_fireAutoRefresh:(NSTimer *)timer -{ - [self refreshProcessList:self]; -} - -/** - * - */ -- (void)_updateSelectedAutoRefreshIntervalInterface -{ - BOOL found = NO; - NSUInteger interval = [prefs integerForKey:SPProcessListAutoRrefreshInterval]; - - NSArray *items = [[autoRefreshIntervalMenuItem submenu] itemArray]; - - // Uncheck all items - for (NSMenuItem *item in items) - { - [item setState:NSOffState]; - } + NSUInteger i = 0; - // Check the selected item - for (NSMenuItem *item in items) - { - if (interval == [item tag]) { - found = YES; - [item setState:NSOnState]; - break; - } - } + // Get processes + MCPResult *processList = [connection queryString:(showFullProcessList) ? @"SHOW FULL PROCESSLIST" : @"SHOW PROCESSLIST"]; - // If a match wasn't found then a custom value is set - if (!found) [[items objectAtIndex:([items count] - 1)] setState:NSOnState]; -} - -/** - * Starts the auto refresh time with the supplied time interval. - */ -- (void)_startAutoRefreshTimerWithInterval:(NSTimeInterval)interval -{ - [prefs setDouble:interval forKey:SPProcessListAutoRrefreshInterval]; + [processList setReturnDataAsStrings:YES]; - // Update the interface - [self _updateSelectedAutoRefreshIntervalInterface]; + if ([processList numOfRows]) [processList dataSeek:0]; - // Kill the timer and restart it with the new interval - [self _killAutoRefreshTimer]; - [self _startAutoRefreshTimer]; -} + [processes removeAllObjects]; -/** - * Gets a list of current database processed on a background thread. - */ -- (void)_getDatabaseProcessListInBackground:(id)object; -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSUInteger i = 0; - - // Get processes - if ([connection isConnected]) { - - MCPResult *processList = [connection listProcesses]; - - [processList setReturnDataAsStrings:YES]; - - if ([processList numOfRows]) [processList dataSeek:0]; - - [processes removeAllObjects]; - - for (i = 0; i < [processList numOfRows]; i++) - { - [processes addObject:[processList fetchRowAsDictionary]]; - } + for (i = 0; i < [processList numOfRows]; i++) + { + [processes addObject:[processList fetchRowAsDictionary]]; } - - // Update the UI on the main thread - [self performSelectorOnMainThread:@selector(_processListRefreshed) withObject:nil waitUntilDone:NO]; - - [pool release]; } /** @@ -714,13 +536,13 @@ // Perform filtering for (NSDictionary *process in processes) { - if (([[process objectForKey:@"Id"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || - ([[process objectForKey:@"User"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || - ([[process objectForKey:@"Host"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || - ((![[process objectForKey:@"db"] isNSNull]) && ([[process objectForKey:@"db"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound)) || + if (([[process objectForKey:@"Id"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || + ([[process objectForKey:@"User"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || + ([[process objectForKey:@"Host"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || + ((![[process objectForKey:@"db"] isNSNull]) && ([[process objectForKey:@"db"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound)) || ([[process objectForKey:@"Command"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || - ([[process objectForKey:@"Time"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || - ((![[process objectForKey:@"State"] isNSNull]) && ([[process objectForKey:@"State"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound)) || + ([[process objectForKey:@"Time"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound) || + ((![[process objectForKey:@"State"] isNSNull]) && ([[process objectForKey:@"State"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound)) || ((![[process objectForKey:@"Info"] isNSNull]) && ([[process objectForKey:@"Info"] rangeOfString:filterString options:NSCaseInsensitiveSearch].location != NSNotFound))) { [processesFiltered addObject:process]; diff --git a/Source/SPQueryController.m b/Source/SPQueryController.m index c8906477..b6a64636 100644 --- a/Source/SPQueryController.m +++ b/Source/SPQueryController.m @@ -778,7 +778,7 @@ static SPQueryController *sharedQueryController = nil; { messagesVisibleSet = nil; [NSObject cancelPreviousPerformRequestsWithTarget:self]; - + [dateFormatter release], dateFormatter = nil; [messagesFullSet release], messagesFullSet = nil; @@ -948,9 +948,9 @@ static SPQueryController *sharedQueryController = nil; if (!error) { messageTemp = [messageTemp stringByAppendingString:@";"]; } - + SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage:messageTemp date:[NSDate date] connection:connection]; - + [consoleMessage setIsError:error]; [messagesFullSet addObject:consoleMessage]; diff --git a/Source/SPSQLParser.m b/Source/SPSQLParser.m index f8112767..fab0ab7f 100644 --- a/Source/SPSQLParser.m +++ b/Source/SPSQLParser.m @@ -915,4 +915,4 @@ TO_BUFFER_STATE to_scan_string (const char *); [super dealloc]; } -@end +@end
\ No newline at end of file diff --git a/Source/SPTableCopy.h b/Source/SPTableCopy.h deleted file mode 100644 index 37ed452a..00000000 --- a/Source/SPTableCopy.h +++ /dev/null @@ -1,61 +0,0 @@ -// -// $Id$ -// -// SPTableCopy.h -// sequel-pro -// -// Created by David Rekowski on Apr 13, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import "SPDBActionCommons.h" - -/** - * The SPTableCopy class povides functionality to copy tables between databases. - */ -@interface SPTableCopy : SPDBActionCommons { -} - -/** - * This method copies a table structure from one db to another. - * - * @param name name of the table in the source database - * @param sourceDB name of the source database - * @param targetDB name of the target database - */ -- (BOOL)copyTable:(NSString *)name from: (NSString *)sourceDB to: (NSString *)targetDB; - -/** - * This method moves a table from one db to another. - * - * @param name name of the table in the source database - * @param sourceDB name of the source database - * @param targetDB name of the target database - */ -- (BOOL)moveTable:(NSString *)name from: (NSString *)sourceDB to: (NSString *)targetDB; - -/** - * This method copies a table including its data from one db to another. - * - * @param name name of the table in the source database - * @param sourceDB name of the source database - * @param targetDB name of the target database - * @param copyWithContent whether to copy the content too, otherwise only structure - */ -- (BOOL)copyTable:(NSString *)tableName from: (NSString *)sourceDB to: (NSString *)targetDB withContent:(BOOL)copyWithContent; - -@end diff --git a/Source/SPTableCopy.m b/Source/SPTableCopy.m deleted file mode 100644 index ab485b60..00000000 --- a/Source/SPTableCopy.m +++ /dev/null @@ -1,139 +0,0 @@ -// -// $Id$ -// -// SPTableCopy.m -// sequel-pro -// -// Created by David Rekowski on Apr 13, 2010 -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import "SPDBActionCommons.h" -#import "SPTableCopy.h" - -@implementation SPTableCopy - -- (NSString *)getCreateTableStatementFor: (NSString *)tableName inDB: (NSString *)sourceDB { - NSString *showCreateTableStatment = [NSString stringWithFormat:@"SHOW CREATE TABLE %@.%@", - [sourceDB backtickQuotedString], - [tableName backtickQuotedString] - ]; - MCPResult *theResult = [connection queryString:showCreateTableStatment]; - - if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Failed to show create table statement", @"show create table error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to retrieve the create table statement for a table.\n\nMySQL said: %@", - @"show create table error informative message"), - [connection getLastErrorMessage]]); - } - if ([theResult numOfRows] != 0) { - return [[theResult fetchRowAsArray] objectAtIndex:1]; - } - return @""; -} - -- (BOOL)copyTable:(NSString *)tableName from: (NSString *)sourceDB to: (NSString *)targetDB { - - NSString *createTableResult = [self getCreateTableStatementFor:tableName inDB:sourceDB]; - NSMutableString *createTableStatement = [[NSMutableString alloc] initWithString:createTableResult]; - - // adding the target DB name and the separator dot after "CREATE TABLE ". - [createTableStatement insertString:@"." atIndex:13]; - [createTableStatement insertString:[targetDB backtickQuotedString] atIndex:13]; - /* - // this only works with MySQL >= 4.1 - NSString *copyStatement = [NSString stringWithFormat:@"CREATE TABLE %@.%@ LIKE %@.%@", - [targetDB backtickQuotedString], - [tableName backtickQuotedString], - [sourceDB backtickQuotedString], - [tableName backtickQuotedString] - ]; - DLog(@"Copying table %@ from %@ to %@", tableName, sourceDB, targetDB); - DLog(@"Copying table: %@", copyStatement); - [connection queryString:copyStatement]; - */ - - [connection queryString:createTableStatement]; - [createTableStatement release]; - - - if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Failed to copy table", @"copy table error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, messageWindow, self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to copy a table.\n\nMySQL said: %@", - @"copy table error informative message"), - [connection getLastErrorMessage]]); - return NO; - } - return YES; -} - -- (BOOL)copyTable:(NSString *)tableName from: (NSString *)sourceDB to: (NSString *)targetDB withContent:(BOOL)copyWithContent{ - // copy the table structure - BOOL structureCopyResult = [self copyTable:tableName from:sourceDB to:targetDB]; - - // optionally copy the table data using an insert select - if (copyWithContent == YES) { - NSString *copyDataStatement = [NSString stringWithFormat:@"INSERT INTO %@.%@ SELECT * FROM %@.%@", - [targetDB backtickQuotedString], - [tableName backtickQuotedString], - [sourceDB backtickQuotedString], - [tableName backtickQuotedString] - ]; - [connection queryString:copyDataStatement]; - - if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Failed to copy table data", @"copy table data error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, [self getTableWindow], self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to copy a table's data.\n\nMySQL said: %@", - @"copy table data error informative message"), - [connection getLastErrorMessage]]); - return NO; - } - return YES; - - } - return structureCopyResult; -} - -- (BOOL)moveTable:(NSString *)tableName from: (NSString *)sourceDB to: (NSString *)targetDB { - - NSString *moveStatement = [NSString stringWithFormat:@"RENAME TABLE %@.%@ TO %@.%@", - [sourceDB backtickQuotedString], - [tableName backtickQuotedString], - [targetDB backtickQuotedString], - [tableName backtickQuotedString] - ]; - // moving the table - DLog(@"Moving table %@ from %@ to %@", tableName, sourceDB, targetDB); - DLog(@"Moving table: %@", moveStatement); - [connection queryString:moveStatement]; - - if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Failed to move table", @"move table error message"), - NSLocalizedString(@"OK", @"OK button"), nil, nil, [self getTableWindow], self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to move a table.\n\nMySQL said: %@", - @"move table error informative message"), - [connection getLastErrorMessage]]); - return NO; - } - return YES; -} - - -@end diff --git a/Source/SPTableData.h b/Source/SPTableData.h index 88b0a78f..a63f31dc 100644 --- a/Source/SPTableData.h +++ b/Source/SPTableData.h @@ -64,7 +64,6 @@ - (BOOL) updateInformationForCurrentView; - (NSDictionary *) informationForView:(NSString *)viewName; - (BOOL) updateStatusInformationForCurrentTable; -- (BOOL) updateTriggersForCurrentTable; - (NSDictionary *) parseFieldDefinitionStringParts:(NSArray *)definitionParts; - (NSArray *) primaryKeyColumnNames; diff --git a/Source/SPTableData.m b/Source/SPTableData.m index ab1857f6..51d490d9 100644 --- a/Source/SPTableData.m +++ b/Source/SPTableData.m @@ -42,8 +42,8 @@ columnNames = [[NSMutableArray alloc] init]; constraints = [[NSMutableArray alloc] init]; status = [[NSMutableDictionary alloc] init]; - - triggers = nil; + triggers = [[NSMutableArray alloc] init]; + tableEncoding = nil; tableCreateSyntax = nil; mySQLConnection = nil; @@ -121,19 +121,6 @@ - (NSArray *) triggers { - - // If triggers is nil, the triggers need to be loaded - if a table is selected on MySQL >= 5.0.2 - if (!triggers) { - if ([tableListInstance tableType] == SPTableTypeTable - && [mySQLConnection serverMajorVersion] >= 5 - && [mySQLConnection serverMinorVersion] >= 0) - { - [self updateTriggersForCurrentTable]; - } else { - return [NSArray array]; - } - } - return (NSArray *)triggers; } @@ -247,11 +234,6 @@ [columnNames removeAllObjects]; [status removeAllObjects]; - if (triggers != nil) { - [triggers release]; - triggers = nil; - } - if (tableEncoding != nil) { [tableEncoding release]; tableEncoding = nil; @@ -626,12 +608,39 @@ [createTableParser release]; [fieldParser release]; + // Triggers + theResult = [mySQLConnection queryString:[NSString stringWithFormat:@"/*!50003 SHOW TRIGGERS WHERE `Table` = %@ */", + [tableName tickQuotedString]]]; + [theResult setReturnDataAsStrings:YES]; + + // Check for any errors, but only display them if a connection still exists + if ([mySQLConnection queryErrored]) { + if ([mySQLConnection isConnected]) { + SPBeginAlertSheet(NSLocalizedString(@"Error retrieving table information", @"error retrieving table information message"), NSLocalizedString(@"OK", @"OK button"), + nil, nil, [NSApp mainWindow], self, nil, nil, nil, + [NSString stringWithFormat:NSLocalizedString(@"An error occurred while retrieving the information for table '%@'. Please try again.\n\nMySQL said: %@", @"error retrieving table information informative message"), + tableName, [mySQLConnection getLastErrorMessage]]); + } + [tableColumns release]; + if (encodingString) [encodingString release]; + + return nil; + } + + [triggers removeAllObjects]; + if( [theResult numOfRows] ) { + for(i=0; i<[theResult numOfRows]; i++){ + [triggers addObject:[theResult fetchRowAsDictionary]]; + } + } + // this will be 'Table' or 'View' [tableData setObject:[resultFieldNames objectAtIndex:0] forKey:@"type"]; [tableData setObject:[NSString stringWithString:encodingString] forKey:@"encoding"]; [tableData setObject:[NSArray arrayWithArray:tableColumns] forKey:@"columns"]; [tableData setObject:[NSArray arrayWithArray:constraints] forKey:@"constraints"]; + [tableData setObject:[NSArray arrayWithArray:triggers] forKey:@"triggers"]; [encodingString release]; [tableColumns release]; @@ -869,36 +878,6 @@ return TRUE; } -/** - * Retrieve the triggers for the current table and add to local cache for reuse. - */ -- (BOOL) updateTriggersForCurrentTable -{ - MCPResult *theResult = [mySQLConnection queryString:[NSString stringWithFormat:@"/*!50003 SHOW TRIGGERS WHERE `Table` = %@ */", - [[tableListInstance tableName] tickQuotedString]]]; - [theResult setReturnDataAsStrings:YES]; - - // Check for any errors, but only display them if a connection still exists - if ([mySQLConnection queryErrored]) { - if ([mySQLConnection isConnected]) { - SPBeginAlertSheet(NSLocalizedString(@"Error retrieving trigger information", @"error retrieving trigger information message"), NSLocalizedString(@"OK", @"OK button"), - nil, nil, [NSApp mainWindow], self, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occurred while retrieving the trigger information for table '%@'. Please try again.\n\nMySQL said: %@", @"error retrieving table information informative message"), - [tableListInstance tableName], [mySQLConnection getLastErrorMessage]]); - if (triggers) [triggers release], triggers = nil; - } - - return NO; - } - - if (triggers) [triggers release]; - triggers = [[NSMutableArray alloc] init]; - for (int i=0; i<[theResult numOfRows]; i++) { - [triggers addObject:[theResult fetchRowAsDictionary]]; - } - - return YES; -} /* * Parse an array of field definition parts - not including name but including type and optionally unsigned/zerofill/null @@ -1143,9 +1122,9 @@ [columns release]; [columnNames release]; [constraints release]; + [triggers release]; [status release]; - if (triggers) [triggers release]; if (tableEncoding) [tableEncoding release]; if (tableCreateSyntax) [tableCreateSyntax release]; if (mySQLConnection) [mySQLConnection release]; diff --git a/Source/SPTableRelations.m b/Source/SPTableRelations.m index 7baa8702..01fec02e 100644 --- a/Source/SPTableRelations.m +++ b/Source/SPTableRelations.m @@ -403,10 +403,10 @@ if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Unable to delete relation", @"error deleting relation message"), + SPBeginAlertSheet(NSLocalizedString(@"Unable to remove relation", @"error removing relation message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [NSApp mainWindow], nil, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"The selected relation couldn't be deleted.\n\nMySQL said: %@", @"error deleting relation informative message"), [connection getLastErrorMessage]]); + [NSString stringWithFormat:NSLocalizedString(@"The selected relation couldn't be removed.\n\nMySQL said: %@", @"error removing relation informative message"), [connection getLastErrorMessage]]); // Abort loop break; @@ -498,7 +498,7 @@ [constraint objectForKey:@"ref_table"], @"fk_table", [constraint objectForKey:@"ref_columns"], @"fk_columns", ([constraint objectForKey:@"update"] ? [constraint objectForKey:@"update"] : @""), @"on_update", - ([constraint objectForKey:@"delete"] ? [constraint objectForKey:@"delete"] : @""), @"on_delete", + ([constraint objectForKey:@"delete"] ? [constraint objectForKey:@"delete"] : @""), @"on_delete", nil]]; } diff --git a/Source/SPTableTriggers.h b/Source/SPTableTriggers.h index 8e97908a..d492253b 100644 --- a/Source/SPTableTriggers.h +++ b/Source/SPTableTriggers.h @@ -57,8 +57,6 @@ @property (readwrite, assign) MCPConnection *connection; -- (void)loadTriggers; - // IB action methods - (IBAction)addTrigger:(id)sender; - (IBAction)removeTrigger:(id)sender; diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m index c202e9c9..5c4f13ad 100644 --- a/Source/SPTableTriggers.m +++ b/Source/SPTableTriggers.m @@ -77,7 +77,12 @@ selector:@selector(triggerStatementTextDidChange:) name:NSTextStorageDidProcessEditingNotification object:[triggerStatementTextView textStorage]]; - + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(tableSelectionChanged:) + name:SPTableChangedNotification + object:tableDocumentInstance]; + // Add observers for document task activity [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(startDocumentTaskForTab:) @@ -89,46 +94,6 @@ object:tableDocumentInstance]; } -/** - * Called whenever the user selects the triggers tab for the first time, - * or switches between tables with the triggers tab active. - */ -- (void)loadTriggers -{ - BOOL enableInteraction = ((![[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableTriggers]) || (![tableDocumentInstance isWorking])); - - // Disable all interface elements by default - [addTriggerButton setEnabled:NO]; - [refreshTriggersButton setEnabled:NO]; - [triggersTableView setEnabled:NO]; - [labelTextField setStringValue:@""]; - - // Show a warning if the version of MySQL is too low to support triggers - if ([connection serverMajorVersion] < 5 - || ([connection serverMajorVersion] == 5 - && [connection serverMinorVersion] == 0 - && [connection serverReleaseVersion] < 2)) - { - [labelTextField setStringValue:NSLocalizedString(@"This version of MySQL does not support triggers. Support for triggers was added in MySQL 5.0.2", @"triggers not supported label")]; - return; - } - - // If no item is selected, or the item selected is not a table, return. - if (![tablesListInstance tableName] || [tablesListInstance tableType] != SPTableTypeTable) - return; - - // Update the text label - [labelTextField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Triggers for table: %@", @"triggers for table label"), [tablesListInstance tableName]]]; - - // Enable interface elements - [addTriggerButton setEnabled:enableInteraction]; - [refreshTriggersButton setEnabled:enableInteraction]; - [triggersTableView setEnabled:YES]; - - // Ensure trigger data is loaded - [self _refreshTriggerDataForcingCacheRefresh:NO]; -} - #pragma mark - #pragma mark IB action methods @@ -220,6 +185,49 @@ [self _refreshTriggerDataForcingCacheRefresh:YES]; } +/** + * Called whenever the user selects a different table. + */ +- (void)tableSelectionChanged:(NSNotification *)notification +{ + BOOL enableInteraction = ((![[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableTriggers]) || (![tableDocumentInstance isWorking])); + + // To begin enable all interface elements + [addTriggerButton setEnabled:enableInteraction]; + [refreshTriggersButton setEnabled:enableInteraction]; + [triggersTableView setEnabled:YES]; + + if (([connection serverMajorVersion] >= 5) && + ([connection serverMinorVersion] >= 0) && + ([connection serverReleaseVersion] >= 2)) { + + // Update the text label + [labelTextField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Triggers for table: %@", @"triggers for table label"), [tablesListInstance tableName]]]; + + [addTriggerButton setEnabled:enableInteraction]; + [refreshTriggersButton setEnabled:enableInteraction]; + [triggersTableView setEnabled:YES]; + + [self _refreshTriggerDataForcingCacheRefresh:NO]; + } + else { + [addTriggerButton setEnabled:NO]; + [refreshTriggersButton setEnabled:NO]; + [triggersTableView setEnabled:NO]; + + [labelTextField setStringValue:NSLocalizedString(@"This version of MySQL does not support triggers. Support for triggers was added in MySQL 5.0.2", @"triggers not supported label")]; + } + + // If a proc or function is selected disable everything. + if (([tablesListInstance tableType] == SPTableTypeProc) || ([tablesListInstance tableType] == SPTableTypeFunc)) { + [addTriggerButton setEnabled:NO]; + [refreshTriggersButton setEnabled:NO]; + [triggersTableView setEnabled:NO]; + + [labelTextField setStringValue:@""]; + } +} + #pragma mark - #pragma mark Tableview datasource methods @@ -320,10 +328,10 @@ if ([connection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Unable to delete trigger", @"error deleting trigger message"), + SPBeginAlertSheet(NSLocalizedString(@"Unable to remove trigger", @"error removing trigger message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [NSApp mainWindow], nil, nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"The selected trigger couldn't be deleted.\n\nMySQL said: %@", @"error deleting trigger informative message"), [connection getLastErrorMessage]]); + [NSString stringWithFormat:NSLocalizedString(@"The selected trigger couldn't be removed.\n\nMySQL said: %@", @"error removing trigger informative message"), [connection getLastErrorMessage]]); // Abort loop break; @@ -471,10 +479,7 @@ if ([tablesListInstance tableType] == SPTableTypeTable) { - if (clearAllCaches) { - [tableDataInstance resetAllData]; - [tableDataInstance updateTriggersForCurrentTable]; - } + if (clearAllCaches) [tableDataInstance updateInformationForCurrentTable]; NSArray *triggers = [tableDataInstance triggers]; diff --git a/Source/SPUserManager.h b/Source/SPUserManager.h index e6eedf50..27590274 100644 --- a/Source/SPUserManager.h +++ b/Source/SPUserManager.h @@ -27,7 +27,7 @@ @class BWAnchoredButtonBar; -@interface SPUserManager : NSWindowController +@interface SPUserManager : NSWindowController { NSPersistentStoreCoordinator *persistentStoreCoordinator; NSManagedObjectModel *managedObjectModel; diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m index 6594d75f..90cc426d 100644 --- a/Source/SPUserManager.m +++ b/Source/SPUserManager.m @@ -181,7 +181,7 @@ * it's data from the SPUser Entity objects in the current managedObjectContext. */ - (void)_initializeTree:(NSArray *)items -{ +{ // Go through each item that contains a dictionary of key-value pairs // for each user currently in the database. for(NSInteger i = 0; i < [items count]; i++) @@ -269,14 +269,14 @@ { // Initialize Databases [schemas removeAllObjects]; - + MCPResult *results = [self.mySqlConnection listDBs]; if ([results numOfRows]) { [results dataSeek:0]; } - for (NSInteger i = 0; i < [results numOfRows]; i++) { + for (int i = 0; i < [results numOfRows]; i++) { [schemas addObject:[results fetchRowAsDictionary]]; } @@ -333,7 +333,7 @@ // Assumes that the child has already been initialized with values from the // global user table. // Select rows from the db table that contains schema privs for each user/host - NSString *queryString = [NSString stringWithFormat:@"SELECT * from `mysql`.`db` d WHERE d.user = %@ and d.host = %@", + NSString *queryString = [NSString stringWithFormat:@"SELECT * from `mysql`.`db` d WHERE d.user = %@ and d.host = %@", [[[child parent] valueForKey:@"user"] tickQuotedString], [[child valueForKey:@"host"] tickQuotedString]]; MCPResult *queryResults = [self.mySqlConnection queryString:queryString]; if ([queryResults numOfRows] > 0) @@ -342,7 +342,7 @@ [queryResults dataSeek:0]; } - for (NSInteger i = 0; i < [queryResults numOfRows]; i++) { + for (int i = 0; i < [queryResults numOfRows]; i++) { NSDictionary *rowDict = [queryResults fetchRowAsDictionary]; NSManagedObject *dbPriv = [NSEntityDescription insertNewObjectForEntityForName:@"Privileges" inManagedObjectContext:[self managedObjectContext]]; @@ -643,6 +643,7 @@ NSArray *children = [[[treeController selectedObjects] objectAtIndex:0] valueForKey:@"children"]; + // On all the children - host entries - set the username to be deleted, // for later query contruction. for(NSManagedObject *child in children) @@ -761,17 +762,17 @@ [treeController fetch:nil]; // After the reset, ensure all original password and user values are up-to-date. - NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"SPUser" - inManagedObjectContext:self.managedObjectContext]; - NSFetchRequest *request = [[[NSFetchRequest alloc] init] autorelease]; - [request setEntity:entityDescription]; - NSArray *userArray = [self.managedObjectContext executeFetchRequest:request error:nil]; - for (NSManagedObject *user in userArray) { - if (![user parent]) { - [user setValue:[user valueForKey:@"user"] forKey:@"originaluser"]; - [user setValue:[user valueForKey:@"password"] forKey:@"originalpassword"]; - } - } + NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"SPUser" + inManagedObjectContext:self.managedObjectContext]; + NSFetchRequest *request = [[[NSFetchRequest alloc] init] autorelease]; + [request setEntity:entityDescription]; + NSArray *userArray = [self.managedObjectContext executeFetchRequest:request error:nil]; + for (NSManagedObject *user in userArray) { + if (![user parent]) { + [user setValue:[user valueForKey:@"user"] forKey:@"originaluser"]; + [user setValue:[user valueForKey:@"password"] forKey:@"originalpassword"]; + } + } } - (void)_setSchemaPrivValues:(NSArray *)objects enabled:(BOOL)enabled @@ -975,7 +976,7 @@ - (BOOL)deleteUsers:(NSArray *)deletedUsers { NSMutableString *droppedUsers = [NSMutableString string]; - + for (NSManagedObject *user in deletedUsers) { if (![[[user entity] name] isEqualToString:@"Privileges"] && [user valueForKey:@"host"] != nil) @@ -986,7 +987,7 @@ } } - + droppedUsers = [[droppedUsers substringToIndex:[droppedUsers length]-2] mutableCopy]; [self.mySqlConnection queryString:[NSString stringWithFormat:@"DROP USER %@", droppedUsers]]; [droppedUsers release]; @@ -1351,9 +1352,9 @@ - (void)tabView:(NSTabView *)usersTabView willSelectTabViewItem:(NSTabViewItem *)tabViewItem { - if ([[tabViewItem identifier] isEqualToString:@"Schema Privileges"]) { - [self _initializeSchemaPrivs]; - } + if ([[tabViewItem identifier] isEqualToString:@"Schema Privileges"]) { + [self _initializeSchemaPrivs]; + } } #pragma mark - diff --git a/Source/TableContent.m b/Source/TableContent.m index b78a6423..90fbe5d1 100644 --- a/Source/TableContent.m +++ b/Source/TableContent.m @@ -546,9 +546,13 @@ */ - (void) loadTableValues { + // If no table is selected, return if (!selectedTable) return; + // Wrap the values load in an autorelease pool to ensure full and timely release + NSAutoreleasePool *loadPool = [[NSAutoreleasePool alloc] init]; + NSMutableString *queryString; NSString *queryStringBeforeLimit = nil; NSString *filterString; @@ -669,6 +673,8 @@ // Trigger a full reload if required if (fullTableReloadRequired) [self reloadTable:self]; + + [loadPool drain]; } /* @@ -760,13 +766,9 @@ pthread_mutex_unlock(&tableValuesLock); } - // Ensure the table is aware of changes - if ([NSThread isMainThread]) { - [tableContentView performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:YES]; - } else { - [tableContentView performSelectorOnMainThread:@selector(noteNumberOfRowsChanged) withObject:nil waitUntilDone:YES]; - [tableContentView performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO]; - } + // Ensure the table is aware of changes, especially for non-threaded loads + [tableContentView performSelectorOnMainThread:@selector(noteNumberOfRowsChanged) withObject:nil waitUntilDone:YES]; + [tableContentView performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO]; // Clean up the autorelease pool and reset the progress indicator [dataLoadingPool drain]; @@ -1351,11 +1353,11 @@ [tempRow replaceObjectAtIndex:i withObject:[dbDataRow objectAtIndex:i]]; } } - + //insert the copied row [tableValues insertRowContents:tempRow atIndex:[tableContentView selectedRow]+1]; tableRowsCount++; - + //select row and go in edit mode [tableContentView reloadData]; [tableContentView selectRowIndexes:[NSIndexSet indexSetWithIndex:[tableContentView selectedRow]+1] byExtendingSelection:NO]; @@ -1372,13 +1374,12 @@ - (IBAction)removeRow:(id)sender { // Check whether a save of the current row is required. - // if (![self saveRowOnDeselect]) + //if (![self saveRowOnDeselect]) // return; // cancel editing (maybe this is not the ideal method -- see xcode docs for that method) [tableWindow endEditingFor:nil]; - if (![tableContentView numberOfSelectedRows]) return; @@ -1972,13 +1973,14 @@ */ - (BOOL)saveRowOnDeselect { - // Save any edits which have been made but not saved to the table yet. - [tableWindow endEditingFor:nil]; // If no rows are currently being edited, or a save is in progress, return success at once. if (!isEditingRow || isSavingRow) return YES; isSavingRow = YES; + // Save any edits which have been made but not saved to the table yet. + [tableWindow endEditingFor:nil]; + // Attempt to save the row, and return YES if the save succeeded. if ([self addRowToDB]) { isSavingRow = NO; @@ -2164,17 +2166,16 @@ currentlyEditingRow = -1; } [tableContentView reloadData]; - } else if ( [contextInfo isEqualToString:@"removeallrows"] ) { + } else if ( [contextInfo isEqualToString:@"removeallrows"] ) { if ( returnCode == NSAlertDefaultReturn ) { //check if the user is currently editing a row if (isEditingRow) { //cancel the edit isEditingRow = NO; // in case the delete fails, make sure we at least stay in a somewhat consistent state - [tableValues replaceRowAtIndex:currentlyEditingRow withRowContents:oldRow]; - currentlyEditingRow = -1; + [tableValues replaceRowAtIndex:currentlyEditingRow withRowContents:oldRow]; + currentlyEditingRow = -1; } - [mySQLConnection queryString:[NSString stringWithFormat:@"DELETE FROM %@", [selectedTable backtickQuotedString]]]; if ( ![mySQLConnection queryErrored] ) { @@ -2187,7 +2188,7 @@ } else { [self performSelector:@selector(showErrorSheetWith:) withObject:[NSArray arrayWithObjects:NSLocalizedString(@"Error", @"error"), - [NSString stringWithFormat:NSLocalizedString(@"Couldn't delete rows.\n\nMySQL said: %@", @"message when deleteing all rows failed"), + [NSString stringWithFormat:NSLocalizedString(@"Couldn't remove rows.\n\nMySQL said: %@", @"message of panel when field cannot be removed"), [mySQLConnection getLastErrorMessage]], nil] afterDelay:0.3]; @@ -2197,40 +2198,40 @@ if ( returnCode == NSAlertDefaultReturn ) { [selectedRows addIndexes:[tableContentView selectedRowIndexes]]; - //check if the user is currently editing a row - if (isEditingRow) { - //make sure that only one row is selected. This should never happen - if ([selectedRows count]!=1) { - NSLog(@"Expected only one selected row, but found %d",[selectedRows count]); - } - // this code is pretty much taken from the escape key handler - if ( isEditingNewRow ) { - // since the user is currently editing a new row, we don't actually have to delete any rows from the database - // we just have to remove the row from the view (and the store) - isEditingRow = NO; - isEditingNewRow = NO; - tableRowsCount--; - [tableValues removeRowAtIndex:currentlyEditingRow]; - currentlyEditingRow = -1; - [self updateCountText]; - [tableContentView reloadData]; - - //deselect the row - [tableContentView selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO]; - - // we also don't have to reload the table, since no query went to the database - return; - } else { - //cancel the edit - isEditingRow = NO; - // in case the delete fails, make sure we at least stay in a somewhat consistent state - [tableValues replaceRowAtIndex:currentlyEditingRow withRowContents:oldRow]; - currentlyEditingRow = -1; - } - - } + //check if the user is currently editing a row + if (isEditingRow) { + //make sure that only one row is selected. This should never happen + if ([selectedRows count]!=1) { + NSLog(@"Expected only one selected row, but found %d",[selectedRows count]); + } + // this code is pretty much taken from the escape key handler + if ( isEditingNewRow ) { + // since the user is currently editing a new row, we don't actually have to delete any rows from the database + // we just have to remove the row from the view (and the store) + isEditingRow = NO; + isEditingNewRow = NO; + tableRowsCount--; + [tableValues removeRowAtIndex:currentlyEditingRow]; + currentlyEditingRow = -1; + [self updateCountText]; + [tableContentView reloadData]; + + //deselect the row + [tableContentView selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO]; + + // we also don't have to reload the table, since no query went to the database + return; + } else { + //cancel the edit + isEditingRow = NO; + // in case the delete fails, make sure we at least stay in a somewhat consistent state + [tableValues replaceRowAtIndex:currentlyEditingRow withRowContents:oldRow]; + currentlyEditingRow = -1; + } + + } [tableContentView selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO]; - + errors = 0; // Disable updating of the Console Log window for large number of queries @@ -2334,7 +2335,7 @@ // Remember affected rows for error checking affectedRows += [mySQLConnection affectedRows]; } - + errors = (affectedRows > 0) ? [selectedRows count] - affectedRows : [selectedRows count]; } else { // if table has more than one PRIMARY KEY @@ -2390,32 +2391,32 @@ // Remember affected rows for error checking affectedRows += [mySQLConnection affectedRows]; } - + errors = (affectedRows > 0) ? [selectedRows count] - affectedRows : [selectedRows count]; } - + // Restore Console Log window's updating bahaviour [[SPQueryController sharedQueryController] setAllowConsoleUpdate:consoleUpdateStatus]; - + if (errors) { NSArray *message; //TODO: The following three messages are NOT localisable! if (errors < 0) { message = [NSArray arrayWithObjects:NSLocalizedString(@"Warning", @"warning"), - [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ more %@ deleted! Please check the Console and inform the Sequel Pro team!", @"message of panel when more rows were deleted"), (long)(errors*-1), ((errors*-1)>1)?@"s":@"", (errors>1)?@"were":@"was"], + [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ more %@ removed! Please check the Console and inform the Sequel Pro team!", @"message of panel when more rows were deleted"), (long)(errors*-1), ((errors*-1)>1)?@"s":@"", (errors>1)?@"were":@"was"], nil]; - } + } else { if (primaryKeyFieldNames == nil) message = [NSArray arrayWithObjects:NSLocalizedString(@"Warning", @"warning"), - [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ ha%@ not been deleted. Reload the table to be sure that the rows exist and use a primary key for your table.", @"message of panel when not all selected fields have been deleted"), (long)errors, (errors>1)?@"s":@"", (errors>1)?@"ve":@"s"], + [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ ha%@ not been removed. Reload the table to be sure that the rows exist and use a primary key for your table.", @"message of panel when not all selected fields have been deleted"), (long)errors, (errors>1)?@"s":@"", (errors>1)?@"ve":@"s"], nil]; else message = [NSArray arrayWithObjects:NSLocalizedString(@"Warning", @"warning"), - [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ ha%@ not been deleted. Reload the table to be sure that the rows exist and check the Console for possible errors inside the primary key%@ for your table.", @"message of panel when not all selected fields have been deleted by using primary keys"), (long)errors, (errors>1)?@"s":@"", (errors>1)?@"ve":@"s", (errors>1)?@"s":@""], + [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ ha%@ not been removed. Reload the table to be sure that the rows exist and check the Console for possible errors inside the primary key%@ for your table.", @"message of panel when not all selected fields have been deleted by using primary keys"), (long)errors, (errors>1)?@"s":@"", (errors>1)?@"ve":@"s", (errors>1)?@"s":@""], nil]; } - + [self performSelector:@selector(showErrorSheetWith:) withObject:message afterDelay:0.3]; @@ -2437,7 +2438,6 @@ // The user clicked cancel in the "sure you wanna delete" message // restore editing or whatever } - } } @@ -3186,7 +3186,7 @@ #pragma mark Other methods /* - * Trap the enter, escape, tab and arrow keys, overriding default behaviour and continuing/ending editing, + * Trap the enter and escape keys, overriding default behaviour and continuing/ending editing, * only within the current row. */ - (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command @@ -3197,8 +3197,9 @@ row = [tableContentView editedRow]; column = [tableContentView editedColumn]; - // Trap tab key - if ( [textView methodForSelector:command] == [textView methodForSelector:@selector(insertTab:)] ) + // Trap enter and tab keys + if ( [textView methodForSelector:command] == [textView methodForSelector:@selector(insertNewline:)] || + [textView methodForSelector:command] == [textView methodForSelector:@selector(insertTab:)] ) { [[control window] makeFirstResponder:control]; @@ -3227,49 +3228,7 @@ } return TRUE; } - - // Trap enter key - else if ( [textView methodForSelector:command] == [textView methodForSelector:@selector(insertNewline:)] ) - { - [[control window] makeFirstResponder:control]; - [self addRowToDB]; - return TRUE; - } - - // Trap down arrow key - else if ( [textView methodForSelector:command] == [textView methodForSelector:@selector(moveDown:)] ) - { - NSUInteger newRow = row+1; - if (newRow>=tableRowsCount) return TRUE; //check if we're already at the end of the list - - [[control window] makeFirstResponder:control]; - [self addRowToDB]; - - if (newRow>=tableRowsCount) return TRUE; //check again. addRowToDB could reload the table and change the number of rows - if (column>=[tableValues columnCount]) return TRUE; //the column count could change too - - [tableContentView selectRowIndexes:[NSIndexSet indexSetWithIndex:newRow] byExtendingSelection:NO]; - [tableContentView editColumn:column row:newRow withEvent:nil select:YES]; - return TRUE; - } - - // Trap up arrow key - else if ( [textView methodForSelector:command] == [textView methodForSelector:@selector(moveUp:)] ) - { - if (row==0) return TRUE; //already at the beginning of the list - NSUInteger newRow = row-1; - - [[control window] makeFirstResponder:control]; - [self addRowToDB]; - - if (newRow>=tableRowsCount) return TRUE; // addRowToDB could reload the table and change the number of rows - if (column>=[tableValues columnCount]) return TRUE; //the column count could change too - - [tableContentView selectRowIndexes:[NSIndexSet indexSetWithIndex:newRow] byExtendingSelection:NO]; - [tableContentView editColumn:column row:newRow withEvent:nil select:YES]; - return TRUE; - } - + // Trap the escape key else if ( [[control window] methodForSelector:command] == [[control window] methodForSelector:@selector(_cancelKey:)] || [textView methodForSelector:command] == [textView methodForSelector:@selector(complete:)] ) diff --git a/Source/TableDocument.h b/Source/TableDocument.h index b3cbb6e7..4b151615 100644 --- a/Source/TableDocument.h +++ b/Source/TableDocument.h @@ -65,8 +65,6 @@ IBOutlet id titleStringView; IBOutlet id databaseSheet; - IBOutlet id databaseCopySheet; - IBOutlet id databaseRenameSheet; IBOutlet id queryProgressBar; IBOutlet NSBox *taskProgressLayer; @@ -79,16 +77,6 @@ IBOutlet id databaseNameField; IBOutlet id databaseEncodingButton; IBOutlet id addDatabaseButton; - - IBOutlet id databaseCopyNameField; - IBOutlet id copyDatabaseDataButton; - IBOutlet id copyDatabaseMessageField; - IBOutlet id copyDatabaseButton; - - IBOutlet id databaseRenameNameField; - IBOutlet id renameDatabaseMessageField; - IBOutlet id renameDatabaseButton; - IBOutlet id chooseDatabaseButton; IBOutlet id historyControl; IBOutlet NSTabView *tableTabView; @@ -186,7 +174,6 @@ - (void)initWithConnectionFile:(NSString *)path; // Connection callback and methods - (void)setConnection:(MCPConnection *)theConnection; -- (MCPConnection *) getConnection; - (void)setShouldAutomaticallyConnect:(BOOL)shouldAutomaticallyConnect; - (BOOL)shouldAutomaticallyConnect; - (void)setKeychainID:(NSString *)theID; @@ -197,8 +184,6 @@ - (void)selectDatabase:(NSString *)aDatabase item:(NSString *)anItem; - (IBAction)addDatabase:(id)sender; - (IBAction)removeDatabase:(id)sender; -- (IBAction)copyDatabase:(id)sender; -- (IBAction)renameDatabase:(id)sender; - (IBAction)showMySQLHelp:(id)sender; - (IBAction)showServerVariables:(id)sender; - (IBAction)showServerProcesses:(id)sender; @@ -291,7 +276,6 @@ - (BOOL)validateMenuItem:(NSMenuItem *)anItem; - (IBAction)saveConnectionSheet:(id)sender; - (IBAction)import:(id)sender; -- (IBAction)importFromClipboard:(id)sender; - (IBAction)export:(id)sender; - (IBAction)exportTable:(id)sender; - (IBAction)exportMultipleTables:(id)sender; diff --git a/Source/TableDocument.m b/Source/TableDocument.m index 3f94aa01..cc1a5bc5 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -56,16 +56,10 @@ #import "SPAlertSheets.h" #import "SPConstants.h" #import "SPMainThreadTrampoline.h" -#import "SPLogger.h" -#import "SPDatabaseCopy.h" -#import "SPTableCopy.h" -#import "SPDatabaseRename.h" @interface TableDocument (PrivateAPI) - (void)_addDatabase; -- (void)_copyDatabase; -- (void)_renameDatabase; - (void)_removeDatabase; - (void)_selectDatabaseAndItem:(NSDictionary *)selectionDetails; @@ -118,7 +112,7 @@ statusValues = nil; printThread = nil; } - + return self; } @@ -247,7 +241,7 @@ [tableWindow addChildWindow:taskProgressWindow ordered:NSWindowAbove]; [taskProgressWindow setReleasedWhenClosed:YES]; [taskProgressWindow setContentView:taskProgressLayer]; - [self centerTaskWindow]; + [self centerTaskWindow]; } /** @@ -758,13 +752,9 @@ break; } } -} -- (MCPConnection *) getConnection { - return mySQLConnection; } - /** * Set whether the connection controller should automatically start * connecting; called by maincontroller, but only for first window. @@ -921,9 +911,9 @@ - (IBAction)addDatabase:(id)sender { if (![tablesListInstance selectionShouldChangeInTableView:nil]) return; - + [databaseNameField setStringValue:@""]; - + [NSApp beginSheet:databaseSheet modalForWindow:tableWindow modalDelegate:self @@ -931,41 +921,6 @@ contextInfo:@"addDatabase"]; } - -/** - * opens the copy database sheet and copies the databsae - */ -- (IBAction)copyDatabase:(id)sender -{ - if (![tablesListInstance selectionShouldChangeInTableView:nil]) return; - - [databaseCopyNameField setStringValue:selectedDatabase]; - [copyDatabaseMessageField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Duplicate database '%@' to:", @"duplicate database message"), selectedDatabase]]; - - [NSApp beginSheet:databaseCopySheet - modalForWindow:tableWindow - modalDelegate:self - didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) - contextInfo:@"copyDatabase"]; -} - -/** - * opens the rename database sheet and renames the databsae - */ -- (IBAction)renameDatabase:(id)sender -{ - if (![tablesListInstance selectionShouldChangeInTableView:nil]) return; - - [databaseRenameNameField setStringValue:selectedDatabase]; - [renameDatabaseMessageField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Rename database '%@' to:", @"rename database message"), selectedDatabase]]; - - [NSApp beginSheet:databaseRenameSheet - modalForWindow:tableWindow - modalDelegate:self - didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) - contextInfo:@"renameDatabase"]; -} - /** * opens sheet to ask user if he really wants to delete the db */ @@ -1049,8 +1004,6 @@ * * if contextInfo == removeDatabase -> Remove the selected database * if contextInfo == addDatabase -> Add a new database - * if contextInfo == copyDatabase -> Duplicate the selected database - * if contextInfo == renameDatabase -> Rename the selected database */ - (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo { @@ -1082,16 +1035,6 @@ else [chooseDatabaseButton selectItemAtIndex:0]; } - } - else if ([contextInfo isEqualToString:@"copyDatabase"]) { - if (returnCode == NSOKButton) { - [self _copyDatabase]; - } - } - else if ([contextInfo isEqualToString:@"renameDatabase"]) { - if (returnCode == NSOKButton) { - [self _renameDatabase]; - } } // Close error status sheet for OPTIMIZE, CHECK, REPAIR etc. else if ([contextInfo isEqualToString:@"statusError"]) { @@ -1282,6 +1225,7 @@ [taskCancelButton setHidden:YES]; // Set flags and prevent further UI interaction in this window + [historyControl setEnabled:NO]; databaseListIsSelectable = NO; [[NSNotificationCenter defaultCenter] postNotificationName:SPDocumentTaskStartNotification object:self]; [mainToolbar validateVisibleItems]; @@ -1397,6 +1341,7 @@ [taskProgressIndicator setIndeterminate:YES]; // Re-enable window interface + [historyControl setEnabled:YES]; databaseListIsSelectable = YES; [[NSNotificationCenter defaultCenter] postNotificationName:SPDocumentTaskEndNotification object:self]; [mainToolbar validateVisibleItems]; @@ -2464,22 +2409,22 @@ */ - (BOOL)couldCommitCurrentViewActions { - [tableWindow endEditingFor:nil]; - switch ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]]) { + [tableWindow endEditingFor:nil]; + switch ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]]) { - // Table structure view - case 0: - return [tableSourceInstance saveRowOnDeselect]; + // Table structure view + case 0: + return [tableSourceInstance saveRowOnDeselect]; - // Table content view - case 1: - return [tableContentInstance saveRowOnDeselect]; + // Table content view + case 1: + return [tableContentInstance saveRowOnDeselect]; - default: - break; - } + default: + break; + } - return YES; + return YES; } #pragma mark - @@ -2629,10 +2574,6 @@ } [tablesListInstance selectionShouldChangeInTableView:nil]; - - // Note that this call does not need to be removed in release builds as leaks analysis output is only - // dumped if [[SPLogger logger] setDumpLeaksOnTermination]; has been called first. - [[SPLogger logger] dumpLeaks]; } #pragma mark - @@ -3114,14 +3055,6 @@ /** * Passes the request to the tableDump object */ -- (IBAction)importFromClipboard:(id)sender -{ - [tableDumpInstance importFromClipboard]; -} - -/** - * Passes the request to the tableDump object - */ - (IBAction)export:(id)sender { if ([sender tag] == -1) { @@ -3179,19 +3112,11 @@ if ([menuItem action] == @selector(import:) || [menuItem action] == @selector(export:) || [menuItem action] == @selector(exportMultipleTables:) || - [menuItem action] == @selector(removeDatabase:) || - [menuItem action] == @selector(copyDatabase:) || - [menuItem action] == @selector(renameDatabase:)) + [menuItem action] == @selector(removeDatabase:)) { return ([self database] != nil); } - - if ([menuItem action] == @selector(importFromClipboard:)) - { - return ([self database] && [[NSPasteboard generalPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:NSStringPboardType, nil]]) ? YES : NO; - - } - + // Change "Save Query/Queries" menu item title dynamically // and disable it if no query in the editor if ([menuItem action] == @selector(saveConnectionSheet:) && [menuItem tag] == 0) { @@ -3392,7 +3317,7 @@ if (![self couldCommitCurrentViewActions]) { [mainToolbar setSelectedItemIdentifier:*SPViewModeToMainToolbarMap[[prefs integerForKey:SPLastViewMode]]]; return; - } + } [tableTabView selectTabViewItemAtIndex:5]; [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableTriggers]; @@ -3498,9 +3423,6 @@ // update the toolbar item size [self updateChooseDatabaseToolbarItemWidth]; - - // The history controller needs to track toolbar item state - trigger setup. - [spHistoryControllerInstance setupInterface]; } /** @@ -3940,13 +3862,7 @@ id object = [notification object]; if (object == databaseNameField) { - [addDatabaseButton setEnabled:([[databaseNameField stringValue] length] > 0 && ![allDatabases containsObject: [databaseNameField stringValue]])]; - } - else if (object == databaseCopyNameField) { - [copyDatabaseButton setEnabled:([[databaseCopyNameField stringValue] length] > 0 && ![allDatabases containsObject: [databaseCopyNameField stringValue]])]; - } - else if (object == databaseRenameNameField) { - [renameDatabaseButton setEnabled:([[databaseRenameNameField stringValue] length] > 0 && ![allDatabases containsObject: [databaseRenameNameField stringValue]])]; + [addDatabaseButton setEnabled:([[databaseNameField stringValue] length] > 0)]; } else if (object == saveConnectionEncryptString) { [saveConnectionEncryptString setStringValue:[saveConnectionEncryptString stringValue]]; @@ -4129,7 +4045,7 @@ [allSystemDatabases release]; [printWebView release]; [taskProgressWindow close]; - + if (connectionController) [connectionController release]; if (processListController) [processListController release]; if (serverVariablesController) [serverVariablesController release]; @@ -4151,45 +4067,6 @@ @implementation TableDocument (PrivateAPI) -- (void)_copyDatabase { - if ([[databaseCopyNameField stringValue] isEqualToString:@""]) { - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, NSLocalizedString(@"Database must have a name.", @"message of panel when no db name is given")); - return; - } - SPDatabaseCopy *dbActionCopy = [[SPDatabaseCopy alloc] init]; - [dbActionCopy setConnection: [self getConnection]]; - [dbActionCopy setMessageWindow: tableWindow]; - - BOOL copyWithContent = [copyDatabaseDataButton state] == NSOnState; - - if ([dbActionCopy copyDatabaseFrom: [self database] - to: [databaseCopyNameField stringValue] - withContent: copyWithContent]) { - [selectedDatabase release]; - selectedDatabase = [[NSString alloc] initWithString:[databaseCopyNameField stringValue]]; - } - [dbActionCopy release]; - [self setDatabases: self]; -} - -- (void)_renameDatabase { - if ([[databaseRenameNameField stringValue] isEqualToString:@""]) { - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, NSLocalizedString(@"Database must have a name.", @"message of panel when no db name is given")); - return; - } - SPDatabaseRename *dbActionRename = [[SPDatabaseRename alloc] init]; - [dbActionRename setConnection: [self getConnection]]; - [dbActionRename setMessageWindow: tableWindow]; - - if ([dbActionRename renameDatabaseFrom: [self database] - to: [databaseRenameNameField stringValue]]) { - [selectedDatabase release]; - selectedDatabase = [[NSString alloc] initWithString:[databaseRenameNameField stringValue]]; - } - [dbActionRename release]; - [self setDatabases: self]; -} - /** * Adds a new database. */ @@ -4253,7 +4130,7 @@ // An error occurred [self performSelector:@selector(showErrorSheetWith:) withObject:[NSArray arrayWithObjects:NSLocalizedString(@"Error", @"error"), - [NSString stringWithFormat:NSLocalizedString(@"Couldn't delete the database.\nMySQL said: %@", @"message of panel when deleting db failed"), + [NSString stringWithFormat:NSLocalizedString(@"Couldn't remove database.\nMySQL said: %@", @"message of panel when removing db failed"), [mySQLConnection getLastErrorMessage]], nil] afterDelay:0.3]; diff --git a/Source/TableDump.h b/Source/TableDump.h index e506a6d2..6a6a34b0 100644 --- a/Source/TableDump.h +++ b/Source/TableDump.h @@ -27,7 +27,7 @@ #import <Cocoa/Cocoa.h> #import <MCPKit/MCPKit.h> -@class SPFieldMapperController, SPFileHandle; +@class SPFieldMapperController; @interface TableDump : NSObject { @@ -74,16 +74,11 @@ IBOutlet id importLinesTerminatedField; IBOutlet id importFieldMapperSheetWindow; - IBOutlet id importFromClipboardSheet; - IBOutlet NSTextView *importFromClipboardTextView; - IBOutlet id importFromClipboardAccessoryView; - IBOutlet id addDropTableSwitch; IBOutlet id addCreateTableSwitch; IBOutlet id addTableContentSwitch; IBOutlet id addErrorsSwitch; IBOutlet id sqlFullStreamingSwitch; - IBOutlet id sqlCompressionSwitch; IBOutlet id csvFullStreamingSwitch; IBOutlet id multiCSVFullStreamingSwitch; IBOutlet id multiXMLFullStreamingSwitch; @@ -122,8 +117,6 @@ NSUInteger exportMode; NSUserDefaults *prefs; BOOL progressCancelled; - - NSSavePanel *currentExportPanel; } // IBAction methods @@ -140,32 +133,31 @@ // Import methods - (void)importFile; -- (void)importFromClipboard; - (void)importSQLFile:(NSString *)filename; - (void)startSQLImportProcessWithFile:(NSString *)filename; - (void)importCSVFile:(NSString *)filename; - (IBAction)changeFormat:(id)sender; -- (void)openPanelDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo; +- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo; - (BOOL) buildFieldMappingArrayWithData:(NSArray *)importData isPreview:(BOOL)dataIsPreviewData ofSoureFile:(NSString*)filename; - (NSString *) mappedValueStringForRowArray:(NSArray *)csvRowArray; - (NSString *) mappedUpdateSetStatementStringForRowArray:(NSArray *)csvRowArray; // Export methods -- (BOOL)dumpSelectedTablesAsSqlToFileHandle:(SPFileHandle *)fileHandle; -- (BOOL)dumpSchemaAsDotToFileHandle:(SPFileHandle *)fileHandle; +- (BOOL)dumpSelectedTablesAsSqlToFileHandle:(NSFileHandle *)fileHandle; +- (BOOL)dumpSchemaAsDotToFileHandle:(NSFileHandle *)fileHandle; - (BOOL)writeCsvForArray:(NSArray *)array orStreamingResult:(MCPStreamingResult *)streamingResult - toFileHandle:(SPFileHandle *)fileHandle + toFileHandle:(NSFileHandle *)fileHandle outputFieldNames:(BOOL)firstLine terminatedBy:(NSString *)terminated enclosedBy:(NSString *)enclosed escapedBy:(NSString *)escaped lineEnds:(NSString *)lineEnds withNumericColumns:(NSArray *)tableColumnNumericStatus totalRows:(NSInteger)totalRows silently:(BOOL)silently; - (BOOL)writeXmlForArray:(NSArray *)array orStreamingResult:(MCPStreamingResult *)streamingResult - toFileHandle:(SPFileHandle *)fileHandle + toFileHandle:(NSFileHandle *)fileHandle tableName:(NSString *)table withHeader:(BOOL)header totalRows:(NSInteger)totalRows silently:(BOOL)silently; - (NSString *)htmlEscapeString:(NSString *)string; - (NSString *)createViewPlaceholderSyntaxForView:(NSString *)viewName; -- (BOOL)exportTables:(NSArray *)selectedTables toFileHandle:(SPFileHandle *)fileHandle usingFormat:(NSString *)type usingMulti:(BOOL)multi; -- (BOOL)exportSelectedTablesToFileHandle:(SPFileHandle *)fileHandle usingFormat:(NSString *)type; +- (BOOL)exportTables:(NSArray *)selectedTables toFileHandle:(NSFileHandle *)fileHandle usingFormat:(NSString *)type usingMulti:(BOOL)multi; +- (BOOL)exportSelectedTablesToFileHandle:(NSFileHandle *)fileHandle usingFormat:(NSString *)type; // New Export methods - (IBAction)switchTab:(id)sender; @@ -177,6 +169,5 @@ // Import/export delegate notifications - (void)panelSelectionDidChange:(id)sender; -- (IBAction)updateExportCompressionSetting:(id)sender; @end diff --git a/Source/TableDump.m b/Source/TableDump.m index 004a8e61..50d380f0 100644 --- a/Source/TableDump.m +++ b/Source/TableDump.m @@ -41,7 +41,6 @@ #import "SPFieldMapperController.h" #import "SPMainThreadTrampoline.h" #import "SPNotLoaded.h" -#import "SPFileHandle.h" @implementation TableDump @@ -157,9 +156,9 @@ { NSString *file; NSString *contextInfo; - currentExportPanel = [NSSavePanel savePanel]; - [currentExportPanel setAllowsOtherFileTypes:YES]; - [currentExportPanel setExtensionHidden:NO]; + NSSavePanel *savePanel = [NSSavePanel savePanel]; + [savePanel setAllowsOtherFileTypes:YES]; + [savePanel setExtensionHidden:NO]; NSString *currentDate = [[NSDate date] descriptionWithCalendarFormat:@"%Y-%m-%d" timeZone:nil locale:nil]; switch ( tag ) { @@ -167,14 +166,9 @@ // export dump exportMode = SPExportingSQL; [self reloadTables:self]; - [sqlCompressionSwitch setState:[prefs boolForKey:SPSQLExportUseCompression]?NSOnState:NSOffState]; - if ([prefs boolForKey:SPSQLExportUseCompression]) { - [currentExportPanel setAllowedFileTypes:[NSArray arrayWithObjects:@"sql.gz", @"gz", nil]]; - } else { - [currentExportPanel setAllowedFileTypes:[NSArray arrayWithObjects:@"sql", nil]]; - } - file = [NSString stringWithFormat:@"%@_%@.%@", [tableDocumentInstance database], currentDate, [currentExportPanel requiredFileType]]; - [currentExportPanel setAccessoryView:exportDumpView]; + file = [NSString stringWithFormat:@"%@_%@.sql", [tableDocumentInstance database], currentDate]; + [savePanel setRequiredFileType:@"sql"]; + [savePanel setAccessoryView:exportDumpView]; contextInfo = @"exportDump"; break; @@ -182,7 +176,7 @@ case 6: exportMode = SPExportingCSV; file = [NSString stringWithFormat:@"%@.csv", [tableDocumentInstance table]]; - [currentExportPanel setAccessoryView:exportCSVView]; + [savePanel setAccessoryView:exportCSVView]; [csvFullStreamingSwitch setEnabled:YES]; contextInfo = @"exportTableContentAsCSV"; break; @@ -198,7 +192,7 @@ case 8: exportMode = SPExportingCSV; file = [NSString stringWithFormat:@"%@ view.csv", [tableDocumentInstance table]]; - [currentExportPanel setAccessoryView:exportCSVView]; + [savePanel setAccessoryView:exportCSVView]; [csvFullStreamingSwitch setEnabled:NO]; contextInfo = @"exportBrowseViewAsCSV"; break; @@ -214,7 +208,7 @@ case 10: exportMode = SPExportingCSV; file = @"customresult.csv"; - [currentExportPanel setAccessoryView:exportCSVView]; + [savePanel setAccessoryView:exportCSVView]; [csvFullStreamingSwitch setEnabled:NO]; contextInfo = @"exportCustomResultAsCSV"; break; @@ -231,7 +225,7 @@ exportMode = SPExportingCSV; [self reloadTables:self]; file = [NSString stringWithFormat:@"%@.csv", [tableDocumentInstance database]]; - [currentExportPanel setAccessoryView:exportMultipleCSVView]; + [savePanel setAccessoryView:exportMultipleCSVView]; contextInfo = @"exportMultipleTablesAsCSV"; break; @@ -240,7 +234,7 @@ exportMode = SPExportingXML; [self reloadTables:self]; file = [NSString stringWithFormat:@"%@.xml", [tableDocumentInstance database]]; - [currentExportPanel setAccessoryView:exportMultipleXMLView]; + [savePanel setAccessoryView:exportMultipleXMLView]; contextInfo = @"exportMultipleTablesAsXML"; break; @@ -249,7 +243,7 @@ exportMode = SPExportingDOT; [self reloadTables:self]; file = [NSString stringWithString:[tableDocumentInstance database]]; - [currentExportPanel setRequiredFileType:@"dot"]; + [savePanel setRequiredFileType:@"dot"]; contextInfo = @"exportDot"; break; @@ -259,24 +253,12 @@ break; } - [currentExportPanel setDelegate:self]; + [savePanel setDelegate:self]; // Open the savePanel - [currentExportPanel beginSheetForDirectory:[prefs objectForKey:@"savePath"] - file:file modalForWindow:tableWindow modalDelegate:self - didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:contextInfo]; - - - // Wait for the SavePanel and check for '.sql.gz' extension; if so - select only the path name without any extensions - while(![currentExportPanel isVisible]) { usleep(100); } - if([[currentExportPanel firstResponder] isKindOfClass:[NSTextView class]]) { - NSTextView *filenameTextView = (NSTextView *)[currentExportPanel firstResponder]; - if([filenameTextView selectedRange].length > 4 && [[filenameTextView string] hasSuffix:@".sql.gz"]) { - NSRange selRange = [filenameTextView selectedRange]; - selRange.length -= 4; - [filenameTextView setSelectedRange:selRange]; - } - } + [savePanel beginSheetForDirectory:[prefs objectForKey:@"savePath"] + file:file modalForWindow:tableWindow modalDelegate:self + didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:contextInfo]; } /** @@ -311,7 +293,7 @@ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSString *exportActionName = [exportAction objectForKey:@"action"]; NSString *exportFile = [exportAction objectForKey:@"filename"]; - SPFileHandle *fileHandle = nil; + NSFileHandle *fileHandle = nil; BOOL success; // Start the notification timer to allow notifications to be shown even if frontmost for long queries @@ -323,14 +305,17 @@ // Error if the file already exists and is not writable, and get a fileHandle to it. if ( [[NSFileManager defaultManager] fileExistsAtPath:exportFile] ) { if ( ![[NSFileManager defaultManager] isWritableFileAtPath:exportFile] - || !(fileHandle = [SPFileHandle fileHandleForWritingAtPath:exportFile]) ) { + || !(fileHandle = [NSFileHandle fileHandleForWritingAtPath:exportFile]) ) { SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, NSLocalizedString(@"Couldn't replace the file. Be sure that you have the necessary privileges.", @"message of panel when file cannot be replaced")); [pool release]; return; } - // Otherwise attempt to create a file + // Truncate the file to zero bytes + [fileHandle truncateFileAtOffset:0]; + + // Otherwise attempt to create a file } else { if ( ![[NSFileManager defaultManager] createFileAtPath:exportFile contents:[NSData data] attributes:nil] ) { SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, @@ -340,7 +325,7 @@ } // Retrieve a filehandle for the file, attempting to delete it on failure. - fileHandle = [SPFileHandle fileHandleForWritingAtPath:exportFile]; + fileHandle = [NSFileHandle fileHandleForWritingAtPath:exportFile]; if ( !fileHandle ) { [[NSFileManager defaultManager] removeFileAtPath:exportFile handler:nil]; SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, @@ -352,7 +337,6 @@ // Export the tables selected in the MySQL export sheet to a file if ( [exportActionName isEqualToString:@"exportDump"] ) { - [fileHandle setShouldWriteWithGzipCompression:([sqlCompressionSwitch state] == NSOnState)]; success = [self dumpSelectedTablesAsSqlToFileHandle:fileHandle]; // Export the full resultset for the currently selected table to a file in CSV format @@ -489,51 +473,6 @@ #pragma mark - #pragma mark Import methods -- (void)importFromClipboard -/* - invoked when user clicks on an ImportFromClipboard menuItem - */ -{ - // Load accessory nib each time - if(![NSBundle loadNibNamed:@"ImportAccessory" owner:self]) { - NSBeep(); - NSLog(@"ImportAccessory accessory dialog could not be loaded."); - return; - } - - // clipboard textview with no wrapping - const CGFloat LargeNumberForText = 1.0e7; - [[importFromClipboardTextView textContainer] setContainerSize:NSMakeSize(LargeNumberForText, LargeNumberForText)]; - [[importFromClipboardTextView textContainer] setWidthTracksTextView:NO]; - [[importFromClipboardTextView textContainer] setHeightTracksTextView:NO]; - [importFromClipboardTextView setAutoresizingMask:NSViewNotSizable]; - [importFromClipboardTextView setMaxSize:NSMakeSize(LargeNumberForText, LargeNumberForText)]; - [importFromClipboardTextView setHorizontallyResizable:YES]; - [importFromClipboardTextView setVerticallyResizable:YES]; - [importFromClipboardTextView setFont:[NSFont fontWithName:@"Monaco" size:11.0f]]; - - if([[[NSPasteboard generalPasteboard] stringForType:NSStringPboardType] length] > 4000) - [importFromClipboardTextView setString:[[[[NSPasteboard generalPasteboard] stringForType:NSStringPboardType] substringToIndex:4000] stringByAppendingString:@"\n…"]]; - else - [importFromClipboardTextView setString:[[NSPasteboard generalPasteboard] stringForType:NSStringPboardType]]; - - // Preset the accessory view with prefs defaults - [importFieldsTerminatedField setStringValue:[prefs objectForKey:SPCSVImportFieldTerminator]]; - [importLinesTerminatedField setStringValue:[prefs objectForKey:SPCSVImportLineTerminator]]; - [importFieldsEscapedField setStringValue:[prefs objectForKey:SPCSVImportFieldEscapeCharacter]]; - [importFieldsEnclosedField setStringValue:[prefs objectForKey:SPCSVImportFieldEnclosedBy]]; - [importFieldNamesSwitch setState:[[prefs objectForKey:SPCSVImportFirstLineIsHeader] boolValue]]; - [importFromClipboardAccessoryView addSubview:importCSVView]; - - [NSApp beginSheet:importFromClipboardSheet - modalForWindow:tableWindow - modalDelegate:self - didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) - contextInfo:@"importFromClipboard"]; - - // NSString ); -} - - (void)importFile /* invoked when user clicks on an import menuItem @@ -594,7 +533,7 @@ - (void) importSQLFile:(NSString *)filename { NSAutoreleasePool *importPool; - SPFileHandle *sqlFileHandle; + NSFileHandle *sqlFileHandle; NSMutableData *sqlDataBuffer; const unsigned char *sqlDataBufferBytes; NSData *fileChunk; @@ -609,7 +548,6 @@ NSInteger dataBufferLength = 0; NSInteger dataBufferPosition = 0; NSInteger dataBufferLastQueryEndPosition = 0; - BOOL fileIsCompressed; BOOL importSQLAsUTF8 = YES; BOOL allDataRead = NO; NSStringEncoding sqlEncoding = NSUTF8StringEncoding; @@ -619,17 +557,14 @@ [[SPGrowlController sharedGrowlController] setVisibilityForNotificationName:@"Import Finished"]; // Open a filehandle for the SQL file - sqlFileHandle = [SPFileHandle fileHandleForReadingAtPath:filename]; + sqlFileHandle = [NSFileHandle fileHandleForReadingAtPath:filename]; if (!sqlFileHandle) { SPBeginAlertSheet(NSLocalizedString(@"Import Error title", @"Import Error"), NSLocalizedString(@"OK button label", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, NSLocalizedString(@"SQL file open error", @"The SQL file you selected could not be found or read.")); - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; return; } - fileIsCompressed = [sqlFileHandle isCompressed]; // Grab the file length fileTotalLength = [[[[NSFileManager defaultManager] attributesOfItemAtPath:filename error:NULL] objectForKey:NSFileSize] longLongValue]; @@ -673,8 +608,6 @@ [sqlDataBuffer release]; [importPool drain]; [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; return; } @@ -723,8 +656,6 @@ [sqlDataBuffer release]; [importPool drain]; [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; return; } } @@ -748,11 +679,7 @@ } // Before entering the following loop, check that we actually have a connection. If not, bail. - if (![mySQLConnection isConnected]) { - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; - return; - } + if (![mySQLConnection isConnected]) return; // Extract and process any complete SQL queries that can be found in the strings parsed so far while (query = [sqlParser trimAndReturnStringToCharacter:';' trimmingInclusively:YES returningInclusively:NO]) { @@ -775,15 +702,9 @@ queriesPerformed++; // Update the progress bar - if (fileIsCompressed) { - [singleProgressBar setDoubleValue:[sqlFileHandle realDataReadLength]]; - [singleProgressText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Imported %@ of SQL", @"SQL import progress text where total size is unknown"), - [NSString stringForByteSize:fileProcessedLength]]]; - } else { - [singleProgressBar setDoubleValue:fileProcessedLength]; - [singleProgressText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Imported %@ of %@", @"SQL import progress text"), - [NSString stringForByteSize:fileProcessedLength], [NSString stringForByteSize:fileTotalLength]]]; - } + [singleProgressBar setDoubleValue:fileProcessedLength]; + [singleProgressText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Imported %@ of %@", @"SQL import progress text"), + [NSString stringForByteSize:fileProcessedLength], [NSString stringForByteSize:fileTotalLength]]]; } // If all the data has been read, break out of the processing loop @@ -815,8 +736,6 @@ [sqlDataBuffer release]; [importPool drain]; [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; // Close progress sheet [self closeAndStopProgressSheet]; @@ -872,9 +791,7 @@ NSInteger i; BOOL allDataRead = NO; BOOL insertBaseStringHasEntries; - NSStringEncoding csvEncoding = [MCPConnection encodingForMySQLEncoding:[[tableDocumentInstance connectionEncoding] UTF8String]]; - fieldMappingArray = nil; fieldMappingGlobalValueArray = nil; @@ -888,8 +805,6 @@ NSLocalizedString(@"OK button label", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, NSLocalizedString(@"CSV file open error", @"The CSV file you selected could not be found or read.")); - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; return; } @@ -953,16 +868,14 @@ [parsedRows release]; [parsePositions release]; if(csvImportTailString) [csvImportTailString release], csvImportTailString = nil; - if(csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; - if(fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil; - if(fieldMappingGlobalValueArray) [fieldMappingGlobalValueArray release], fieldMappingGlobalValueArray = nil; - if(fieldMappingTableColumnNames) [fieldMappingTableColumnNames release], fieldMappingTableColumnNames = nil; - if(fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release], fieldMappingTableDefaultValues = nil; - if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; + if(csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; + if(fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil; + if(fieldMappingGlobalValueArray) [fieldMappingGlobalValueArray release], fieldMappingGlobalValueArray = nil; + if(fieldMappingTableColumnNames) [fieldMappingTableColumnNames release], fieldMappingTableColumnNames = nil; + if(fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release], fieldMappingTableDefaultValues = nil; + if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; [importPool drain]; [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; return; } @@ -1002,16 +915,14 @@ [parsedRows release]; [parsePositions release]; if(csvImportTailString) [csvImportTailString release], csvImportTailString = nil; - if(csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; - if(fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil; - if(fieldMappingGlobalValueArray) [fieldMappingGlobalValueArray release], fieldMappingGlobalValueArray = nil; - if(fieldMappingTableColumnNames) [fieldMappingTableColumnNames release], fieldMappingTableColumnNames = nil; - if(fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release], fieldMappingTableDefaultValues = nil; - if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; + if(csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; + if(fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil; + if(fieldMappingGlobalValueArray) [fieldMappingGlobalValueArray release], fieldMappingGlobalValueArray = nil; + if(fieldMappingTableColumnNames) [fieldMappingTableColumnNames release], fieldMappingTableColumnNames = nil; + if(fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release], fieldMappingTableDefaultValues = nil; + if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; [importPool drain]; [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; return; } @@ -1055,16 +966,14 @@ [parsedRows release]; [parsePositions release]; if(csvImportTailString) [csvImportTailString release], csvImportTailString = nil; - if(csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; - if(fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil; - if(fieldMappingGlobalValueArray) [fieldMappingGlobalValueArray release], fieldMappingGlobalValueArray = nil; - if(fieldMappingTableColumnNames) [fieldMappingTableColumnNames release], fieldMappingTableColumnNames = nil; - if(fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release], fieldMappingTableDefaultValues = nil; - if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; + if(csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; + if(fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil; + if(fieldMappingGlobalValueArray) [fieldMappingGlobalValueArray release], fieldMappingGlobalValueArray = nil; + if(fieldMappingTableColumnNames) [fieldMappingTableColumnNames release], fieldMappingTableColumnNames = nil; + if(fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release], fieldMappingTableDefaultValues = nil; + if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; [importPool drain]; [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; return; } @@ -1102,23 +1011,21 @@ // Before entering the following loop, check that we actually have a connection. If not, bail. if (![mySQLConnection isConnected]) { [self closeAndStopProgressSheet]; - [csvParser release]; - [csvDataBuffer release]; - [parsedRows release]; - [parsePositions release]; - if(csvImportTailString) [csvImportTailString release], csvImportTailString = nil; - if(csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; - if(fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil; - if(fieldMappingGlobalValueArray) [fieldMappingGlobalValueArray release], fieldMappingGlobalValueArray = nil; - if(fieldMappingTableColumnNames) [fieldMappingTableColumnNames release], fieldMappingTableColumnNames = nil; - if(fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release], fieldMappingTableDefaultValues = nil; - if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; - [importPool drain]; - [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; - return; - } + [csvParser release]; + [csvDataBuffer release]; + [parsedRows release]; + [parsePositions release]; + if(csvImportTailString) [csvImportTailString release], csvImportTailString = nil; + if(csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; + if(fieldMappingArray) [fieldMappingArray release], fieldMappingArray = nil; + if(fieldMappingGlobalValueArray) [fieldMappingGlobalValueArray release], fieldMappingGlobalValueArray = nil; + if(fieldMappingTableColumnNames) [fieldMappingTableColumnNames release], fieldMappingTableColumnNames = nil; + if(fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release], fieldMappingTableDefaultValues = nil; + if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; + [importPool drain]; + [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; + return; + } // If we have more than the csvRowsPerQuery amount, or if we're at the end of the // available data, construct and run a query. @@ -1262,8 +1169,6 @@ if(fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; [importPool drain]; [tableDocumentInstance setQueryMode:SPInterfaceQueryMode]; - if([filename hasPrefix:SPImportClipboardTempFileNamePrefix]) - [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; // Close progress sheet [self closeAndStopProgressSheet]; @@ -1273,8 +1178,8 @@ [self showErrorSheetWithMessage:errors]; } - // Import finished Growl notification - [[SPGrowlController sharedGrowlController] notifyWithTitle:@"Import Finished" + // Import finished Growl notification + [[SPGrowlController sharedGrowlController] notifyWithTitle:@"Import Finished" description:[NSString stringWithFormat:NSLocalizedString(@"Finished importing %@",@"description for finished importing growl notification"), [filename lastPathComponent]] window:tableWindow notificationName:@"Import Finished"]; @@ -1290,71 +1195,30 @@ } } -- (void)openPanelDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo +- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo { - - // if contextInfo == nil NSOpenPanel else importFromClipboardPanel - // save values to preferences - if(contextInfo == nil) - [prefs setObject:[(NSOpenPanel*)sheet directory] forKey:@"openPath"]; - else - [importFromClipboardTextView setString:@""]; - + [prefs setObject:[sheet directory] forKey:@"openPath"]; [prefs setObject:[[importFormatPopup selectedItem] title] forKey:@"importFormatPopupValue"]; - // close NSOpenPanel sheet - if(contextInfo == nil) - [sheet orderOut:self]; - - // check if user canceled + // close sheet, and check if user canceled + [sheet orderOut:self]; if (returnCode != NSOKButton) return; // Reset progress cancelled from any previous runs progressCancelled = NO; - NSString *importFileName; + if(lastFilename) [lastFilename release]; lastFilename = nil; + lastFilename = [[NSString stringWithString:[sheet filename]] retain]; - // File path from NSOpenPanel - if(contextInfo == nil) - { - if(lastFilename) [lastFilename release]; lastFilename = nil; - lastFilename = [[NSString stringWithString:[(NSOpenPanel*)sheet filename]] retain]; - importFileName = [NSString stringWithString:lastFilename]; - if(lastFilename == nil || ![lastFilename length]) { - NSBeep(); - return; - } - } - - // Import from Clipboard - else - { - importFileName = [NSString stringWithFormat:@"%@%@", SPImportClipboardTempFileNamePrefix, - [[NSDate date] descriptionWithCalendarFormat:@"%H%M%S" - timeZone:nil - locale:[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]; - - // Write clipboard content to temp file using the connection encoding - - NSStringEncoding encoding; - if ([[[importFormatPopup selectedItem] title] isEqualToString:@"SQL"]) - encoding = NSUTF8StringEncoding; - else - encoding = [MCPConnection encodingForMySQLEncoding:[[tableDocumentInstance connectionEncoding] UTF8String]]; - - if(![[[NSPasteboard generalPasteboard] stringForType:NSStringPboardType] writeToFile:importFileName atomically:NO encoding:encoding error:nil]) { - NSBeep(); - NSLog(@"Couldn't write clipboard content to temporary file."); - return; - } + if(lastFilename == nil || ![lastFilename length]) { + NSBeep(); + return; } - if(importFileName == nil) return; - // begin import process - [NSThread detachNewThreadSelector:@selector(importBackgroundProcess:) toTarget:self withObject:importFileName]; + [NSThread detachNewThreadSelector:@selector(importBackgroundProcess:) toTarget:self withObject:lastFilename]; } - (void)startSQLImportProcessWithFile:(NSString *)filename @@ -1618,7 +1482,7 @@ /* Dump the selected tables to a file handle in SQL format. */ -- (BOOL)dumpSelectedTablesAsSqlToFileHandle:(SPFileHandle *)fileHandle +- (BOOL)dumpSelectedTablesAsSqlToFileHandle:(NSFileHandle *)fileHandle { NSInteger i,j,t,rowCount, colCount, lastProgressValue, queryLength; NSInteger progressBarWidth; @@ -1921,52 +1785,52 @@ // Release the result set [streamingResult release]; - } - - // Export triggers, if any - queryResult = [mySQLConnection queryString:[NSString stringWithFormat:@"/*!50003 SHOW TRIGGERS WHERE `Table` = %@ */;", - [tableName tickQuotedString]]]; - [queryResult setReturnDataAsStrings:YES]; - if ( [queryResult numOfRows] ) { - [metaString setString:@"\n"]; - [metaString appendString:@"DELIMITER ;;\n"]; - for (int s=0; s<[queryResult numOfRows]; s++) { - NSDictionary *triggers = [[NSDictionary alloc] initWithDictionary:[queryResult fetchRowAsDictionary]]; + queryResult = [mySQLConnection queryString:[NSString stringWithFormat:@"/*!50003 SHOW TRIGGERS WHERE `Table` = %@ */;", + [tableName tickQuotedString]]]; + [queryResult setReturnDataAsStrings:YES]; + if ( [queryResult numOfRows] ) { + [metaString setString:@"\n"]; + [metaString appendString:@"DELIMITER ;;\n"]; - //Definer is user@host but we need to escape it to `user`@`host` - NSArray *triggersDefiner = [[triggers objectForKey:@"Definer"] componentsSeparatedByString:@"@"]; - NSString *escapedDefiner = [NSString stringWithFormat:@"%@@%@", - [[triggersDefiner objectAtIndex:0] backtickQuotedString], - [[triggersDefiner objectAtIndex:1] backtickQuotedString] - ]; + for (int s=0; s<[queryResult numOfRows]; s++) { + NSDictionary *triggers = [[NSDictionary alloc] initWithDictionary:[queryResult fetchRowAsDictionary]]; + + //Definer is user@host but we need to escape it to `user`@`host` + NSArray *triggersDefiner = [[triggers objectForKey:@"Definer"] componentsSeparatedByString:@"@"]; + NSString *escapedDefiner = [NSString stringWithFormat:@"%@@%@", + [[triggersDefiner objectAtIndex:0] backtickQuotedString], + [[triggersDefiner objectAtIndex:1] backtickQuotedString] + ]; + + [metaString appendString:[NSString stringWithFormat:@"/*!50003 SET SESSION SQL_MODE=\"%@\" */;;\n", + [triggers objectForKey:@"sql_mode"]]]; + [metaString appendString:@"/*!50003 CREATE */ "]; + [metaString appendString:[NSString stringWithFormat:@"/*!50017 DEFINER=%@ */ ", + escapedDefiner]]; + [metaString appendString:[NSString stringWithFormat:@"/*!50003 TRIGGER %@ %@ %@ ON %@ FOR EACH ROW %@ */;;\n", + [[triggers objectForKey:@"Trigger"] backtickQuotedString], + [triggers objectForKey:@"Timing"], + [triggers objectForKey:@"Event"], + [[triggers objectForKey:@"Table"] backtickQuotedString], + [triggers objectForKey:@"Statement"] + ]]; + [triggers release]; + } - [metaString appendString:[NSString stringWithFormat:@"/*!50003 SET SESSION SQL_MODE=\"%@\" */;;\n", - [triggers objectForKey:@"sql_mode"]]]; - [metaString appendString:@"/*!50003 CREATE */ "]; - [metaString appendString:[NSString stringWithFormat:@"/*!50017 DEFINER=%@ */ ", - escapedDefiner]]; - [metaString appendString:[NSString stringWithFormat:@"/*!50003 TRIGGER %@ %@ %@ ON %@ FOR EACH ROW %@ */;;\n", - [[triggers objectForKey:@"Trigger"] backtickQuotedString], - [triggers objectForKey:@"Timing"], - [triggers objectForKey:@"Event"], - [[triggers objectForKey:@"Table"] backtickQuotedString], - [triggers objectForKey:@"Statement"] - ]]; - [triggers release]; + [metaString appendString:@"DELIMITER ;\n"]; + [metaString appendString:@"/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;\n"]; + [fileHandle writeData:[metaString dataUsingEncoding:NSUTF8StringEncoding]]; } - [metaString appendString:@"DELIMITER ;\n"]; - [metaString appendString:@"/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;\n"]; - [fileHandle writeData:[metaString dataUsingEncoding:NSUTF8StringEncoding]]; - } - - if ([mySQLConnection queryErrored]) { - [errors appendString:[NSString stringWithFormat:@"%@\n", [mySQLConnection getLastErrorMessage]]]; - if ( [addErrorsSwitch state] == NSOnState ) { - [fileHandle writeData:[[NSString stringWithFormat:@"# Error: %@\n", [mySQLConnection getLastErrorMessage]] - dataUsingEncoding:NSUTF8StringEncoding]]; + if ([mySQLConnection queryErrored]) { + [errors appendString:[NSString stringWithFormat:@"%@\n", [mySQLConnection getLastErrorMessage]]]; + if ( [addErrorsSwitch state] == NSOnState ) { + [fileHandle writeData:[[NSString stringWithFormat:@"# Error: %@\n", [mySQLConnection getLastErrorMessage]] + dataUsingEncoding:NSUTF8StringEncoding]]; + } } + } // Add an additional separator between tables @@ -2147,7 +2011,7 @@ See here for language syntax: http://www.graphviz.org/doc/info/lang.html (Not the easiest to decode) */ -- (BOOL)dumpSchemaAsDotToFileHandle:(SPFileHandle *)fileHandle +- (BOOL)dumpSchemaAsDotToFileHandle:(NSFileHandle *)fileHandle { NSMutableString *metaString = [NSMutableString string]; NSInteger progressBarWidth; @@ -2292,7 +2156,7 @@ /* * Takes an array, or a streaming result set, and writes the appropriate data - * in CSV format to the supplied SPFileHandle. + * in CSV format to the supplied NSFileHandle. * The field terminators, quotes and escape characters should all be supplied * together with the line terminators; if an array of numeric column types is * supplied, processing of rows is significantly sped up as each field does not @@ -2301,7 +2165,7 @@ * for arrays, this must be accurate, but for streaming result sets it is only * used for drawing the progress bar. */ -- (BOOL)writeCsvForArray:(NSArray *)array orStreamingResult:(MCPStreamingResult *)streamingResult toFileHandle:(SPFileHandle *)fileHandle +- (BOOL)writeCsvForArray:(NSArray *)array orStreamingResult:(MCPStreamingResult *)streamingResult toFileHandle:(NSFileHandle *)fileHandle outputFieldNames:(BOOL)outputFieldNames terminatedBy:(NSString *)fieldSeparatorString enclosedBy:(NSString *)enclosingString @@ -2546,14 +2410,14 @@ /* * Takes an array, or streaming result reference, and writes it in XML - * format to the supplied SPFileHandle. For output, also takes a table + * format to the supplied NSFileHandle. For output, also takes a table * name for tag construction, and a toggle to control whether the header * is output. * Also takes a totalRows parameter, which is used for drawing progress bars - * for arrays, this must be accurate, but for streaming result sets it is only * used for drawing the progress bar. */ -- (BOOL)writeXmlForArray:(NSArray *)array orStreamingResult:(MCPStreamingResult *)streamingResult toFileHandle:(SPFileHandle *)fileHandle tableName:(NSString *)table withHeader:(BOOL)header totalRows:(NSInteger)totalRows silently:(BOOL)silently +- (BOOL)writeXmlForArray:(NSArray *)array orStreamingResult:(MCPStreamingResult *)streamingResult toFileHandle:(NSFileHandle *)fileHandle tableName:(NSString *)table withHeader:(BOOL)header totalRows:(NSInteger)totalRows silently:(BOOL)silently { NSAutoreleasePool *xmlExportPool; NSStringEncoding tableEncoding = [MCPConnection encodingForMySQLEncoding:[[tableDocumentInstance connectionEncoding] UTF8String]]; @@ -2718,7 +2582,7 @@ Processes the selected tables within the multiple table export accessory view and passes them to be exported. */ -- (BOOL)exportSelectedTablesToFileHandle:(SPFileHandle *)fileHandle usingFormat:(NSString *)type +- (BOOL)exportSelectedTablesToFileHandle:(NSFileHandle *)fileHandle usingFormat:(NSString *)type { NSInteger i; NSMutableArray *selectedTables = [NSMutableArray array]; @@ -2737,7 +2601,7 @@ Walks through the selected tables and exports them to a file handle. The export type must be "csv" for CSV format, and "xml" for XML format. */ -- (BOOL)exportTables:(NSArray *)selectedTables toFileHandle:(SPFileHandle *)fileHandle usingFormat:(NSString *)type usingMulti:(BOOL)multi +- (BOOL)exportTables:(NSArray *)selectedTables toFileHandle:(NSFileHandle *)fileHandle usingFormat:(NSString *)type usingMulti:(BOOL)multi { NSInteger i, j; MCPResult *queryResult; @@ -3113,14 +2977,6 @@ // If a single file is selected and the extension is recognised, change the format dropdown automatically if ( [selectedFilenames count] != 1 ) return; pathExtension = [[[selectedFilenames objectAtIndex:0] pathExtension] uppercaseString]; - - // If a file has extension ".gz", indicating gzip, fetch the next extension - if ([pathExtension isEqualToString:@"GZ"]) { - NSMutableString *pathString = [NSMutableString stringWithString:[selectedFilenames objectAtIndex:0]]; - [pathString deleteCharactersInRange:NSMakeRange([pathString length]-3, 3)]; - pathExtension = [[pathString pathExtension] uppercaseString]; - } - if ([pathExtension isEqualToString:@"SQL"]) { [importFormatPopup selectItemWithTitle:@"SQL"]; [self changeFormat:self]; @@ -3156,33 +3012,6 @@ } } -/** - * When the compression setting on export is altered, update the filename - * and if appropriate the required extension. - */ -- (IBAction)updateExportCompressionSetting:(id)sender -{ - if (exportMode == SPExportingSQL) { - if ([sender state] == NSOnState) { - [currentExportPanel setAllowedFileTypes:[NSArray arrayWithObjects:@"sql.gz", @"gz", nil]]; - - // if file name text view is the first responder re-select the path name only without '.sql.gz' - if([[currentExportPanel firstResponder] isKindOfClass:[NSTextView class]]) { - NSTextView *filenameTextView = (NSTextView *)[currentExportPanel firstResponder]; - if([filenameTextView selectedRange].length > 4 && [[filenameTextView string] hasSuffix:@".sql.gz"]) { - NSRange selRange = [filenameTextView selectedRange]; - selRange.length -= 4; - [filenameTextView setSelectedRange:selRange]; - } - } - - } else { - [currentExportPanel setAllowedFileTypes:[NSArray arrayWithObject:@"sql"]]; - } - [prefs setBool:([sender state] == NSOnState) forKey:SPSQLExportUseCompression]; - } -} - #pragma mark - #pragma mark Other diff --git a/Source/TableSource.m b/Source/TableSource.m index d6c8fdcf..27314b03 100644 --- a/Source/TableSource.m +++ b/Source/TableSource.m @@ -346,9 +346,9 @@ // Check whether a save of the current row is required. if (![self saveRowOnDeselect]) return; - + NSInteger index = [tableSourceView selectedRow]; - + if ((index == -1) || (index > ([tableFields count] - 1))) return; // Check if the user tries to delete the last defined field in table @@ -358,7 +358,7 @@ defaultButton:NSLocalizedString(@"OK", @"OK button") alternateButton:nil otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"You cannot delete the last field in a table. Delete the table instead.", @"You cannot delete the last field in a table. Delete the table instead.")]; + informativeTextWithFormat:NSLocalizedString(@"You cannot delete the last field in a table. Use 'Remove table' (DROP TABLE) instead.", @"You cannot delete the last field in that table. Use 'Remove table' (DROP TABLE) instead")]; [alert setAlertStyle:NSCriticalAlertStyle]; @@ -389,7 +389,7 @@ defaultButton:NSLocalizedString(@"Delete", @"delete button") alternateButton:NSLocalizedString(@"Cancel", @"cancel button") otherButton:nil - informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"This field is part of a foreign key relationship with the table '%@'. This relationship must be removed before the field can be deleted.\n\nAre you sure you want to continue to delete the relationship and the field? This action cannot be undone.", @"delete field and foreign key informative message"), referencedTable] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the field '%@'? This action cannot be undone.", @"delete field informative message"), field]]; + informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"This field is part of a foreign key relationship with the table '%@'. This relationship must be removed before the field can be deleted.\n\nAre you sure you want to continue to remove the relationship and the field? This action cannot be undone.", @"delete field and foreign key informative message"), referencedTable] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the field '%@'? This action cannot be undone.", @"delete field informative message"), field]]; [alert setAlertStyle:NSCriticalAlertStyle]; @@ -414,11 +414,11 @@ if (![self saveRowOnDeselect]) return; NSInteger index = [indexView selectedRow]; - - if ((index == -1) || (index > ([indexes count] - 1))) return; - - NSString *keyName = [[indexes objectAtIndex:index] objectForKey:@"Key_name"]; - NSString *columnName = [[indexes objectAtIndex:index] objectForKey:@"Column_name"]; + + if ((index == -1) || (index > ([indexes count] - 1))) return; + + NSString *keyName = [[indexes objectAtIndex:index] objectForKey:@"Key_name"]; + NSString *columnName = [[indexes objectAtIndex:index] objectForKey:@"Column_name"]; BOOL hasForeignKey = NO; NSString *constraintName = @""; @@ -441,7 +441,7 @@ defaultButton:NSLocalizedString(@"Delete", @"delete button") alternateButton:NSLocalizedString(@"Cancel", @"cancel button") otherButton:nil - informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"The foreign key relationship '%@' has a dependency on this index. This relationship must be removed before the index can be deleted.\n\nAre you sure you want to continue to delete the relationship and the index? This action cannot be undone.", @"delete index and foreign key informative message"), constraintName] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the index '%@'? This action cannot be undone.", @"delete index informative message"), keyName]]; + informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"The foreign key relationship '%@' has a dependency on this index. This relationship must be removed before the index can be deleted.\n\nAre you sure you want to continue to remove the relationship and the index? This action cannot be undone.", @"delete index and foreign key informative message"), constraintName] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the index '%@'? This action cannot be undone.", @"delete index informative message"), keyName]]; [alert setAlertStyle:NSCriticalAlertStyle]; @@ -589,20 +589,20 @@ closes the keySheet return; if(valueAsString == nil || ![valueAsString length]) { - // reload data and bail - [tableDataInstance resetAllData]; - [extendedTableInfoInstance loadTable:selTable]; - [tableInfoInstance tableChanged:nil]; - return; - } - - NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; - [formatter setNumberStyle:NSNumberFormatterDecimalStyle]; - NSNumber *autoIncValue = [formatter numberFromString:valueAsString]; - [formatter release]; - - [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ AUTO_INCREMENT = %@", [selTable backtickQuotedString], [autoIncValue stringValue]]]; + // reload data and bail + [tableDataInstance resetAllData]; + [extendedTableInfoInstance loadTable:selTable]; + [tableInfoInstance tableChanged:nil]; + return; + } + + NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; + [formatter setNumberStyle:NSNumberFormatterDecimalStyle]; + NSNumber *autoIncValue = [formatter numberFromString:valueAsString]; + [formatter release]; + + [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ AUTO_INCREMENT = %@", [selTable backtickQuotedString], [autoIncValue stringValue]]]; if ([mySQLConnection queryErrored]) { SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), @@ -611,15 +611,14 @@ closes the keySheet selTable, [mySQLConnection getLastErrorMessage]]); } - // reload data - [tableDataInstance resetStatusData]; - if([[tableDocumentInstance valueForKeyPath:@"tableTabView"] indexOfTabViewItem:[[tableDocumentInstance valueForKeyPath:@"tableTabView"] selectedTabViewItem]] == 3) { - [tableDataInstance resetAllData]; - [extendedTableInfoInstance loadTable:selTable]; - } - - [tableInfoInstance tableChanged:nil]; + // reload data + [tableDataInstance resetStatusData]; + if([[tableDocumentInstance valueForKeyPath:@"tableTabView"] indexOfTabViewItem:[[tableDocumentInstance valueForKeyPath:@"tableTabView"] selectedTabViewItem]] == 3) { + [tableDataInstance resetAllData]; + [extendedTableInfoInstance loadTable:selTable]; + } + [tableInfoInstance tableChanged:nil]; } /** @@ -937,23 +936,23 @@ closes the keySheet /** * A method to show an error sheet after a short delay, so that it can - * be called from within an endSheet selector. This should be called on + * be called from within an endSheet selector. This should be called on * the main thread. */ -(void)showErrorSheetWith:(NSDictionary *)errorDictionary { - // If this method has been called directly, invoke a delay. Invoking the delay - // on the main thread ensures the timer fires on the main thread. - if (![errorDictionary objectForKey:@"delayed"]) { - NSMutableDictionary *delayedErrorDictionary = [NSMutableDictionary dictionaryWithDictionary:errorDictionary]; - [delayedErrorDictionary setObject:[NSNumber numberWithBool:YES] forKey:@"delayed"]; - [self performSelector:@selector(showErrorSheetWith:) withObject:delayedErrorDictionary afterDelay:0.3]; - return; - } - - // Display the error sheet - SPBeginAlertSheet([errorDictionary objectForKey:@"title"], NSLocalizedString(@"OK", @"OK button"), + // If this method has been called directly, invoke a delay. Invoking the delay + // on the main thread ensures the timer fires on the main thread. + if (![errorDictionary objectForKey:@"delayed"]) { + NSMutableDictionary *delayedErrorDictionary = [NSMutableDictionary dictionaryWithDictionary:errorDictionary]; + [delayedErrorDictionary setObject:[NSNumber numberWithBool:YES] forKey:@"delayed"]; + [self performSelector:@selector(showErrorSheetWith:) withObject:delayedErrorDictionary afterDelay:0.3]; + return; + } + + // Display the error sheet + SPBeginAlertSheet([errorDictionary objectForKey:@"title"], NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, [errorDictionary objectForKey:@"message"]); } @@ -1785,8 +1784,8 @@ would result in a position change. // Check for errors, but only if the query wasn't cancelled if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; - [errorDictionary setObject:NSLocalizedString(@"Unable to delete relation", @"error deleting relation message") forKey:@"title"]; - [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to delete the relation '%@'.\n\nMySQL said: %@", @"error deleting relation informative message"), relationName, [mySQLConnection getLastErrorMessage]] forKey:@"message"]; + [errorDictionary setObject:NSLocalizedString(@"Unable to remove relation", @"error removing relation message") forKey:@"title"]; + [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to remove the relation '%@'.\n\nMySQL said: %@", @"error removing relation informative message"), relationName, [mySQLConnection getLastErrorMessage]] forKey:@"message"]; [[self onMainThread] showErrorSheetWith:errorDictionary]; } } @@ -1797,9 +1796,10 @@ would result in a position change. // Check for errors, but only if the query wasn't cancelled if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { + NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; [errorDictionary setObject:NSLocalizedString(@"Error", @"error") forKey:@"title"]; - [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"Couldn't delete field %@.\nMySQL said: %@", @"message of panel when field cannot be deleted"), + [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"Couldn't remove field %@.\nMySQL said: %@", @"message of panel when field cannot be removed"), [[tableFields objectAtIndex:[tableSourceView selectedRow]] objectForKey:@"Field"], [mySQLConnection getLastErrorMessage]] forKey:@"message"]; [[self onMainThread] showErrorSheetWith:errorDictionary]; @@ -1850,9 +1850,9 @@ would result in a position change. // Check for errors, but only if the query wasn't cancelled if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; - [errorDictionary setObject:NSLocalizedString(@"Unable to delete relation", @"error deleting relation message") forKey:@"title"]; - [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to delete the relation '%@'.\n\nMySQL said: %@", @"error deleting relation informative message"), constraintName, [mySQLConnection getLastErrorMessage]] forKey:@"message"]; - [[self onMainThread] showErrorSheetWith:errorDictionary]; + [errorDictionary setObject:NSLocalizedString(@"Unable to remove relation", @"error removing relation message") forKey:@"title"]; + [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to remove the relation '%@'.\n\nMySQL said: %@", @"error removing relation informative message"), constraintName, [mySQLConnection getLastErrorMessage]] forKey:@"message"]; + [[self onMainThread] showErrorSheetWith:errorDictionary]; } } @@ -1867,8 +1867,8 @@ would result in a position change. // Check for errors, but only if the query wasn't cancelled if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; - [errorDictionary setObject:NSLocalizedString(@"Unable to delete index", @"error deleting index message") forKey:@"title"]; - [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to delete the index.\n\nMySQL said: %@", @"error deleting index informative message"), [mySQLConnection getLastErrorMessage]] forKey:@"message"]; + [errorDictionary setObject:NSLocalizedString(@"Unable to remove index", @"error removing index message") forKey:@"title"]; + [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to remove the index.\n\nMySQL said: %@", @"error removing index informative message"), [mySQLConnection getLastErrorMessage]] forKey:@"message"]; [[self onMainThread] showErrorSheetWith:errorDictionary]; } else { diff --git a/Source/TablesList.h b/Source/TablesList.h index 36d3ccaa..f6741369 100644 --- a/Source/TablesList.h +++ b/Source/TablesList.h @@ -48,7 +48,6 @@ IBOutlet id extendedTableInfoInstance; IBOutlet id databaseDataInstance; IBOutlet id tableInfoInstance; - IBOutlet id tableTriggersInstance; IBOutlet SPHistoryController *spHistoryControllerInstance; IBOutlet id tableWindow; @@ -82,7 +81,7 @@ IBOutlet NSMenuItem *separatorTableMenuItem; IBOutlet NSMenuItem *showCreateSyntaxMenuItem; IBOutlet NSMenuItem *separatorTableMenuItem2; - + MCPConnection *mySQLConnection; // Table list context menu items @@ -103,7 +102,7 @@ BOOL tableListIsSelectable; BOOL tableListContainsViews; - BOOL structureLoaded, contentLoaded, statusLoaded, triggersLoaded, alertSheetOpened; + BOOL structureLoaded, contentLoaded, statusLoaded, alertSheetOpened; } // IBAction methods diff --git a/Source/TablesList.m b/Source/TablesList.m index 15def773..b9e8270a 100644 --- a/Source/TablesList.m +++ b/Source/TablesList.m @@ -253,12 +253,11 @@ // Query the structure of all databases in the background if(sender == self) - // Invoked by SP + // Invoked by SP [NSThread detachNewThreadSelector:@selector(queryDbStructureWithUserInfo:) toTarget:mySQLConnection withObject:nil]; else // User press refresh button ergo force update [NSThread detachNewThreadSelector:@selector(queryDbStructureWithUserInfo:) toTarget:mySQLConnection withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"forceUpdate", [NSNumber numberWithBool:YES], @"cancelQuerying", nil]]; - } @@ -693,35 +692,40 @@ // Restore view states as appropriate [spHistoryControllerInstance restoreViewStates]; - structureLoaded = NO; - contentLoaded = NO; - statusLoaded = NO; - triggersLoaded = NO; if( selectedTableType == SPTableTypeView || selectedTableType == SPTableTypeTable) { if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 0 ) { [tableSourceInstance loadTable:selectedTableName]; structureLoaded = YES; + contentLoaded = NO; + statusLoaded = NO; } else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 1 ) { if(tableEncoding == nil) { [tableContentInstance loadTable:nil]; } else { [tableContentInstance loadTable:selectedTableName]; } + structureLoaded = NO; contentLoaded = YES; + statusLoaded = NO; } else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 3 ) { - [[extendedTableInfoInstance onMainThread] loadTable:selectedTableName]; + [extendedTableInfoInstance performSelectorOnMainThread:@selector(loadTable:) withObject:selectedTableName waitUntilDone:YES]; + structureLoaded = NO; + contentLoaded = NO; statusLoaded = YES; - } else if ( [tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 5 ) { - [[tableTriggersInstance onMainThread] loadTriggers]; - triggersLoaded = YES; + } else { + structureLoaded = NO; + contentLoaded = NO; + statusLoaded = NO; } } else { // if we are not looking at a table or view, clear these [tableSourceInstance loadTable:nil]; [tableContentInstance loadTable:nil]; - [[extendedTableInfoInstance onMainThread] loadTable:nil]; - [[tableTriggersInstance onMainThread] loadTriggers]; + [extendedTableInfoInstance performSelectorOnMainThread:@selector(loadTable:) withObject:nil waitUntilDone:YES]; + structureLoaded = NO; + contentLoaded = NO; + statusLoaded = NO; } // Update the "Show Create Syntax" window if it's already opened @@ -751,77 +755,73 @@ // Update the selected table name and type if (selectedTableName) [selectedTableName release]; - + if ([indexes count]) { selectedTableName = [[NSString alloc] initWithString:@""]; - } + } else { selectedTableName = nil; } - + selectedTableType = SPTableTypeNone; [tableSourceInstance loadTable:nil]; [tableContentInstance loadTable:nil]; [extendedTableInfoInstance loadTable:nil]; - [tableTriggersInstance loadTriggers]; - + structureLoaded = NO; contentLoaded = NO; statusLoaded = NO; - triggersLoaded = NO; // Set gear menu items Remove/Duplicate table/view according to the table types // if at least one item is selected if ([indexes count]) { - NSUInteger currentIndex = [indexes lastIndex]; BOOL areTableTypeEqual = YES; NSInteger lastType = [[filteredTableTypes objectAtIndex:currentIndex] integerValue]; - + while (currentIndex != NSNotFound) { if ([[filteredTableTypes objectAtIndex:currentIndex] integerValue] != lastType) { areTableTypeEqual = NO; break; } - + currentIndex = [indexes indexLessThanIndex:currentIndex]; } - if (areTableTypeEqual) { switch (lastType) { case SPTableTypeTable: - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete Tables", @"delete tables menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove Tables", @"remove tables menu title")]; [truncateTableButton setTitle:NSLocalizedString(@"Truncate Tables", @"truncate tables menu item")]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete Tables", @"delete tables menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Tables", @"remove tables menu title")]; [truncateTableContextButton setTitle:NSLocalizedString(@"Truncate Tables", @"truncate tables menu item")]; [truncateTableButton setHidden:NO]; [truncateTableContextButton setHidden:NO]; break; case SPTableTypeView: - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete Views", @"delete views menu title")]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete Views", @"delete views menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove Views", @"remove views menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Views", @"remove views menu title")]; [truncateTableButton setHidden:YES]; [truncateTableContextButton setHidden:YES]; break; case SPTableTypeProc: - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete Procedures", @"delete procedures menu title")]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete Procedures", @"delete procedures menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove Procedures", @"remove procedures menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Procedures", @"remove procedures menu title")]; [truncateTableButton setHidden:YES]; [truncateTableContextButton setHidden:YES]; break; case SPTableTypeFunc: - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete Functions", @"delete functions menu title")]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete Functions", @"delete functions menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove Functions", @"remove functions menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Functions", @"remove functions menu title")]; [truncateTableButton setHidden:YES]; [truncateTableContextButton setHidden:YES]; break; } } else { - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete Items", @"delete items menu title")]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete Items", @"delete items menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove Items", @"remove items menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Items", @"remove items menu title")]; [truncateTableButton setHidden:YES]; [truncateTableContextButton setHidden:YES]; } @@ -840,7 +840,7 @@ [separatorTableMenuItem setHidden:YES]; [separatorTableMenuItem2 setHidden:YES]; [showCreateSyntaxMenuItem setHidden:YES]; - + NSMenu *tableSubMenu = [[[NSApp mainMenu] itemWithTitle:@"Table"] submenu]; [[tableSubMenu itemAtIndex:6] setTitle:NSLocalizedString(@"Check Selected Items", @"check selected items menu item")]; @@ -894,7 +894,7 @@ [separatorTableContextMenuItem setHidden:NO]; [separatorTableMenuItem2 setHidden:NO]; [separatorTableContextMenuItem2 setHidden:NO]; - + // Set gear menu items Remove/Duplicate table/view and mainMenu > Table items // according to the table types NSMenu *tableSubMenu = [[[NSApp mainMenu] itemWithTitle:@"Table"] submenu]; @@ -922,7 +922,7 @@ [duplicateTableMenuItem setHidden:NO]; [duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate View...", @"duplicate view menu title")]; [truncateTableButton setHidden:YES]; - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete View", @"delete view menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove View", @"remove view menu title")]; [showCreateSyntaxMenuItem setHidden:NO]; [showCreateSyntaxMenuItem setTitle:NSLocalizedString(@"Show Create View Syntax...", @"show create view syntax menu item")]; @@ -931,7 +931,7 @@ [duplicateTableContextMenuItem setHidden:NO]; [duplicateTableContextMenuItem setTitle:NSLocalizedString(@"Duplicate View...", @"duplicate view menu title")]; [truncateTableContextButton setHidden:YES]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete View", @"delete view menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove View", @"remove view menu title")]; [showCreateSyntaxContextMenuItem setHidden:NO]; [showCreateSyntaxContextMenuItem setTitle:NSLocalizedString(@"Show Create View Syntax...", @"show create view syntax menu item")]; } @@ -959,7 +959,7 @@ [duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Table...", @"duplicate table menu title")]; [truncateTableButton setHidden:NO]; [truncateTableButton setTitle:NSLocalizedString(@"Truncate Table", @"truncate table menu title")]; - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete Table", @"delete table menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove Table", @"remove table menu title")]; [showCreateSyntaxMenuItem setHidden:NO]; [showCreateSyntaxMenuItem setTitle:NSLocalizedString(@"Show Create Table Syntax...", @"show create table syntax menu item")]; @@ -969,7 +969,7 @@ [duplicateTableContextMenuItem setTitle:NSLocalizedString(@"Duplicate Table...", @"duplicate table menu title")]; [truncateTableContextButton setHidden:NO]; [truncateTableContextButton setTitle:NSLocalizedString(@"Truncate Table", @"truncate table menu title")]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete Table", @"delete table menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Table", @"remove table menu title")]; [showCreateSyntaxContextMenuItem setHidden:NO]; [showCreateSyntaxContextMenuItem setTitle:NSLocalizedString(@"Show Create Table Syntax...", @"show create table syntax menu item")]; } @@ -990,16 +990,16 @@ [duplicateTableMenuItem setHidden:NO]; [duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Procedure...", @"duplicate proc menu title")]; [truncateTableButton setHidden:YES]; - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete Procedure", @"delete proc menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove Procedure", @"remove proc menu title")]; [showCreateSyntaxMenuItem setHidden:NO]; [showCreateSyntaxMenuItem setTitle:NSLocalizedString(@"Show Create Procedure Syntax...", @"show create proc syntax menu item")]; - + [renameTableContextMenuItem setHidden:NO]; [renameTableContextMenuItem setTitle:NSLocalizedString(@"Rename Procedure...", @"rename proc menu title")]; [duplicateTableContextMenuItem setHidden:NO]; [duplicateTableContextMenuItem setTitle:NSLocalizedString(@"Duplicate Procedure...", @"duplicate proc menu title")]; [truncateTableContextButton setHidden:YES]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete Procedure", @"delete proc menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Procedure", @"remove proc menu title")]; [showCreateSyntaxContextMenuItem setHidden:NO]; [showCreateSyntaxContextMenuItem setTitle:NSLocalizedString(@"Show Create Procedure Syntax...", @"show create proc syntax menu item")]; } @@ -1020,16 +1020,16 @@ [duplicateTableMenuItem setHidden:NO]; [duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Function...", @"duplicate func menu title")]; [truncateTableButton setHidden:YES]; - [removeTableMenuItem setTitle:NSLocalizedString(@"Delete Function", @"delete func menu title")]; + [removeTableMenuItem setTitle:NSLocalizedString(@"Remove Function", @"remove func menu title")]; [showCreateSyntaxMenuItem setHidden:NO]; [showCreateSyntaxMenuItem setTitle:NSLocalizedString(@"Show Create Function Syntax...", @"show create func syntax menu item")]; - + [renameTableContextMenuItem setHidden:NO]; [renameTableContextMenuItem setTitle:NSLocalizedString(@"Rename Function...", @"rename func menu title")]; [duplicateTableContextMenuItem setHidden:NO]; [duplicateTableContextMenuItem setTitle:NSLocalizedString(@"Duplicate Function...", @"duplicate func menu title")]; [truncateTableContextButton setHidden:YES]; - [removeTableContextMenuItem setTitle:NSLocalizedString(@"Delete Function", @"delete func menu title")]; + [removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Function", @"remove func menu title")]; [showCreateSyntaxContextMenuItem setHidden:NO]; [showCreateSyntaxContextMenuItem setTitle:NSLocalizedString(@"Show Create Function Syntax...", @"show create func syntax menu item")]; } @@ -1355,27 +1355,24 @@ // if the 'table' is a view or a table, reload the currently selected view if (selectedTableType == SPTableTypeTable || selectedTableType == SPTableTypeView) { - statusLoaded = NO; - structureLoaded = NO; - contentLoaded = NO; - triggersLoaded = NO; switch ([tabView indexOfTabViewItem:[tabView selectedTabViewItem]]) { case 0: [tableSourceInstance loadTable:newTableName]; structureLoaded = YES; + contentLoaded = statusLoaded = NO; break; case 1: [tableContentInstance loadTable:newTableName]; contentLoaded = YES; + structureLoaded = statusLoaded = NO; break; case 3: [extendedTableInfoInstance loadTable:newTableName]; statusLoaded = YES; + structureLoaded = contentLoaded = NO; break; - case 5: - [tableTriggersInstance loadTriggers]; - triggersLoaded = YES; - break; + default: + statusLoaded = structureLoaded = contentLoaded = NO; } } } @@ -1560,9 +1557,8 @@ { NSAutoreleasePool *tabLoadPool = [[NSAutoreleasePool alloc] init]; - if ([tablesListView numberOfSelectedRows] == 1 - && ([self tableType] == SPTableTypeTable || [self tableType] == SPTableTypeView) ) - { + if ( [tablesListView numberOfSelectedRows] == 1 && + ([self tableType] == SPTableTypeTable || [self tableType] == SPTableTypeView) ) { if ( ([tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 0) && !structureLoaded ) { [tableSourceInstance loadTable:selectedTableName]; @@ -1575,14 +1571,9 @@ } if ( ([tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 3) && !statusLoaded ) { - [[extendedTableInfoInstance onMainThread] loadTable:selectedTableName]; + [extendedTableInfoInstance performSelectorOnMainThread:@selector(loadTable:) withObject:selectedTableName waitUntilDone:YES]; statusLoaded = YES; } - - if ( ([tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 5) && !triggersLoaded ) { - [[tableTriggersInstance onMainThread] loadTriggers]; - triggersLoaded = YES; - } } else { [tableSourceInstance loadTable:nil]; @@ -1811,7 +1802,6 @@ structureLoaded = NO; contentLoaded = NO; statusLoaded = NO; - triggersLoaded = NO; isTableListFiltered = NO; tableListIsSelectable = YES; tableListContainsViews = NO; @@ -1937,7 +1927,7 @@ [alert addButtonWithTitle:NSLocalizedString(@"Stop", @"stop button")]; } [alert setMessageText:NSLocalizedString(@"Error", @"error")]; - [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Couldn't delete '%@'.\nMySQL said: %@", @"message of panel when an item cannot be deleted"), [tables objectAtIndex:currentIndex], [mySQLConnection getLastErrorMessage]]]; + [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Couldn't remove '%@'.\nMySQL said: %@", @"message of panel when an item cannot be removed"), [tables objectAtIndex:currentIndex], [mySQLConnection getLastErrorMessage]]]; [alert setAlertStyle:NSWarningAlertStyle]; if ([indexes indexLessThanIndex:currentIndex] == NSNotFound) { [alert beginSheetModalForWindow:tableWindow modalDelegate:self didEndSelector:nil contextInfo:nil]; @@ -2360,7 +2350,7 @@ [mySQLConnection queryString: [NSString stringWithFormat: @"DROP %@ %@", stringTableType, [oldTableName backtickQuotedString]]]; if ([mySQLConnection queryErrored]) { - [NSException raise:@"MySQL Error" format:NSLocalizedString(@"An error occured while renaming. I couldn't delete '%@'.\n\nMySQL said: %@", @"rename precedure/function error - can't delete old procedure"), oldTableName, [mySQLConnection getLastErrorMessage]]; + [NSException raise:@"MySQL Error" format:NSLocalizedString(@"An error occured while renaming. I couldn't remove '%@'.\n\nMySQL said: %@", @"rename precedure/function error - can't remove old procedure"), oldTableName, [mySQLConnection getLastErrorMessage]]; } return; } diff --git a/UnitTests/SPDatabaseCopyTest.h b/UnitTests/SPDatabaseCopyTest.h deleted file mode 100644 index 641b3cdd..00000000 --- a/UnitTests/SPDatabaseCopyTest.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// $Id$ -// -// SPDatabaseCopyTest.h -// sequel-pro -// -// Created by David Rekowski -// Copyright (c) 2010 David Rekowski. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#define USE_APPLICATION_UNIT_TEST 1 - -#import <SenTestingKit/SenTestingKit.h> - -@interface SPDatabaseCopyTest : SenTestCase { -} -- (void) testCopyDatabase; -- (void) testCreateDatabase; - -@end diff --git a/UnitTests/SPDatabaseCopyTest.m b/UnitTests/SPDatabaseCopyTest.m deleted file mode 100644 index 593989de..00000000 --- a/UnitTests/SPDatabaseCopyTest.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// $Id$ -// -// SPDatabaseCopyTest.m -// sequel-pro -// -// Created by David Rekowski -// Copyright (c) 2010 David Rekowski. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import <OCMock/OCMock.h> -#import "SPAlertSheets.h" -#import "SPDatabaseCopyTest.h" -#import "SPDatabaseCopy.h" -#import "SPTableCopy.h" -#import "MCPConnection.h" -#import "SPDatabaseInfo.h" -#import "SPStringAdditions.h" -#import "SPLogger.h" - -@implementation SPDatabaseCopyTest - -- (SPDatabaseCopy *) getDatabaseCopyFixture { - SPDatabaseCopy *dbCopy = [[SPDatabaseCopy alloc] init]; - return [dbCopy autorelease]; -} - -- (SPTableCopy *) getTableCopyFixture { - SPTableCopy *tableCopy = [[SPTableCopy alloc] init]; - return [tableCopy autorelease]; -} - -- (id) getMockConnection { - id mockConnection = [OCMockObject niceMockForClass:[MCPConnection class]]; - return mockConnection; -} - -- (id) getMockDBInfo { - id mockDBInfo = [OCMockObject niceMockForClass:[SPDatabaseInfo class]]; - return mockDBInfo; -} - -- (void) testCopyDatabase { - - SPDatabaseCopy *dbCopy = [self getDatabaseCopyFixture]; - id mockConnection = [self getMockConnection]; - [[mockConnection expect] queryString:@"CREATE DATABASE `target_name`"]; - [[mockConnection expect] listTablesFromDB:@"source_name"]; - [[[mockConnection stub] andReturn:[[NSArray alloc] init]] listTablesFromDB:@"source_name"]; - [dbCopy setConnection:mockConnection]; - - id mockDBInfo = [self getMockDBInfo]; - - BOOL varNo = NO; - BOOL varYes = YES; - [[[mockDBInfo expect] andReturnValue:[NSValue value:&varYes withObjCType:@encode(BOOL)]] databaseExists:@"source_name"]; - - [[[mockDBInfo expect] andReturnValue:[NSValue value:&varNo withObjCType:@encode(BOOL)]] databaseExists:@"target_name"]; - - [dbCopy setDbInfo:mockDBInfo]; - - NSString *source = [[NSString alloc] initWithString:@"source_name"]; - NSString *target = [[NSString alloc] initWithString:@"target_name"]; - STAssertTrue([dbCopy copyDatabaseFrom:source to:target withContent:YES], @"method renameDatabaseFrom:to: is supposed to return YES"); - - [mockConnection verify]; - [source release]; - [target release]; -} - -- (void) testCreateDatabase { - SPDatabaseCopy *dbCopy = [self getDatabaseCopyFixture]; - // test missing :) -} - -@end diff --git a/UnitTests/SPDatabaseInfoTest.h b/UnitTests/SPDatabaseInfoTest.h deleted file mode 100644 index 81763b4a..00000000 --- a/UnitTests/SPDatabaseInfoTest.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// $Id$ -// -// SPDatabaseInfoTest.h -// sequel-pro -// -// Created by David Rekowski -// Copyright (c) 2010 David Rekowski. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#define USE_APPLICATION_UNIT_TEST 1 - -#import <SenTestingKit/SenTestingKit.h> - - -@interface SPDatabaseInfoTest : SenTestCase { - -} - -- (void)testDatabaseExists; -- (void)testListDBs; -- (void)testListDBsLike; - - -@end diff --git a/UnitTests/SPDatabaseInfoTest.m b/UnitTests/SPDatabaseInfoTest.m deleted file mode 100644 index a53104e9..00000000 --- a/UnitTests/SPDatabaseInfoTest.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// $Id$ -// -// SPDatabaseInfoTest.m -// sequel-pro -// -// Created by David Rekowski -// Copyright (c) 2010 David Rekowski. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import <OCMock/OCMock.h> -#import "SPDatabaseInfo.h" -#import "SPDatabaseInfoTest.h" - - -@implementation SPDatabaseInfoTest - -- (SPDatabaseInfo *)getDatabaseInfoFixture { - SPDatabaseInfo *dbInfo = [[SPDatabaseInfo alloc] init]; - return dbInfo; -} - -- (id) getMockConnection { - id mockConnection = [OCMockObject niceMockForClass:[MCPConnection class]]; - return mockConnection; -} - -- (id) getMockMCPResult { - id mockResult = [OCMockObject niceMockForClass:[MCPResult class]]; - return mockResult; -} - -- (void)testDatabaseExists { - SPDatabaseInfo *dbInfo = [self getDatabaseInfoFixture]; - - NSArray *tables = [[NSArray alloc] initWithObjects: @"db_one", nil]; - id mockMCPResult = [self getMockMCPResult]; - [[mockMCPResult expect] numOfRows]; - [[[mockMCPResult stub] andReturn:[[NSNumber alloc] initWithInt:1]] numOfRows]; - [[mockMCPResult expect] fetchRowAsArray]; - [[[mockMCPResult stub] andReturn:tables] fetchRowAsArray]; - id mockConnection = [self getMockConnection]; - - [[[mockConnection expect] andReturn:mockMCPResult] queryString:@"SHOW DATABASES"]; - [dbInfo setConnection:mockConnection]; - [dbInfo databaseExists:@"db_one"]; - [mockConnection verify]; -} - -- (void)testListDBs { - SPDatabaseInfo *dbInfo = [self getDatabaseInfoFixture]; - id mockConnection = [self getMockConnection]; - [[mockConnection expect] queryString:@"SHOW DATABASES"]; - [dbInfo setConnection:mockConnection]; - [dbInfo listDBs]; - [mockConnection verify]; -} - -- (void)testListDBsLike { - SPDatabaseInfo *dbInfo = [self getDatabaseInfoFixture]; - id mockConnection = [self getMockConnection]; - [[mockConnection expect] queryString:@"SHOW DATABASES LIKE `test_db`"]; - [dbInfo setConnection:mockConnection]; - [dbInfo listDBsLike:@"test_db"]; - [mockConnection verify]; -} - - -@end diff --git a/UnitTests/SPDatabaseRenameTest.h b/UnitTests/SPDatabaseRenameTest.h deleted file mode 100644 index 473f4716..00000000 --- a/UnitTests/SPDatabaseRenameTest.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// $Id$ -// -// SPDatabaseRenameTest.h -// sequel-pro -// -// Created by David Rekowski -// Copyright (c) 2010 David Rekowski. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#define USE_APPLICATION_UNIT_TEST 1 - -#import <SenTestingKit/SenTestingKit.h> - -@interface SPDatabaseRenameTest : SenTestCase { -} -- (void) testRenameDatabase; -- (void) testCreateDatabase; - -@end diff --git a/UnitTests/SPDatabaseRenameTest.m b/UnitTests/SPDatabaseRenameTest.m deleted file mode 100644 index 51562db9..00000000 --- a/UnitTests/SPDatabaseRenameTest.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// $Id$ -// -// SPDatabaseRenameTest.m -// sequel-pro -// -// Created by David Rekowski -// Copyright (c) 2010 David Rekowski. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import <OCMock/OCMock.h> -#import "SPDatabaseRenameTest.h" -#import "SPDatabaseRename.h" -#import "SPTableCopy.h" -#import "MCPConnection.h" -#import "SPDatabaseInfo.h" -#import "SPStringAdditions.h" -#import "SPLogger.h" - - -@implementation SPDatabaseRenameTest - -- (SPDatabaseRename *) getDatabaseRenameFixture { - SPDatabaseRename *dbRename = [[SPDatabaseRename alloc] init]; - return [dbRename autorelease]; -} - -- (SPTableCopy *) getTableCopyFixture { - SPTableCopy *tableCopy = [[SPTableCopy alloc] init]; - return [tableCopy autorelease]; -} - -- (id) getMockConnection { - id mockConnection = [OCMockObject niceMockForClass:[MCPConnection class]]; - return mockConnection; -} - -- (id) getMockDBInfo { - id mockDBInfo = [OCMockObject niceMockForClass:[SPDatabaseInfo class]]; - return mockDBInfo; -} - -- (void) testRenameDatabase { - - SPDatabaseRename *dbRename = [self getDatabaseRenameFixture]; - - id mockConnection = [self getMockConnection]; - [[mockConnection expect] queryString:@"CREATE DATABASE `target_name`"]; - [[mockConnection expect] listTablesFromDB:@"source_name"]; - [[[mockConnection stub] andReturn:[[NSArray alloc] init]] listTablesFromDB:@"source_name"]; - [dbRename setConnection:mockConnection]; - - id mockDBInfo = [self getMockDBInfo]; - - BOOL varNo = NO; - BOOL varYes = YES; - [[[mockDBInfo expect] andReturnValue:[NSValue value:&varYes withObjCType:@encode(BOOL)]] databaseExists:@"source_name"]; - - [[[mockDBInfo expect] andReturnValue:[NSValue value:&varNo withObjCType:@encode(BOOL)]] databaseExists:@"target_name"]; - - [dbRename setDbInfo:mockDBInfo]; - - NSString *source = [[NSString alloc] initWithString:@"source_name"]; - NSString *target = [[NSString alloc] initWithString:@"target_name"]; - STAssertTrue([dbRename renameDatabaseFrom:source to:target], @"method renameDatabaseFrom:to: is supposed to return YES"); - - [mockConnection verify]; - [source release]; - [target release]; -} - -- (void) testCreateDatabase { - SPDatabaseRename *dbRename = [self getDatabaseRenameFixture]; -} - -@end diff --git a/UnitTests/SPTableCopyTest.h b/UnitTests/SPTableCopyTest.h deleted file mode 100644 index 25d0da7b..00000000 --- a/UnitTests/SPTableCopyTest.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// $Id$ -// -// SPTableCopyTest.h -// sequel-pro -// -// Created by David Rekowski -// Copyright (c) 2010 David Rekowski. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#define USE_APPLICATION_UNIT_TEST 1 - -#import <SenTestingKit/SenTestingKit.h> - -@interface SPTableCopyTest : SenTestCase { - -} - -- (void)testCopyTableFromToWithData; - - -@end diff --git a/UnitTests/SPTableCopyTest.m b/UnitTests/SPTableCopyTest.m deleted file mode 100644 index f0e31c14..00000000 --- a/UnitTests/SPTableCopyTest.m +++ /dev/null @@ -1,72 +0,0 @@ -// -// $Id$ -// -// SPTableCopyTest.m -// sequel-pro -// -// Created by David Rekowski -// Copyright (c) 2010 David Rekowski. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at <http://code.google.com/p/sequel-pro/> - -#import <OCMock/OCMock.h> -#import "SPTableCopy.h" -#import "SPTableCopyTest.h" - - -@implementation SPTableCopyTest - -- (id) getMockConnection { - id mockConnection = [OCMockObject niceMockForClass:[MCPConnection class]]; - return [mockConnection autorelease]; -} - -- (id) getMockResult { - id mockResult = [OCMockObject niceMockForClass:[MCPResult class]]; - return mockResult; -} - -- (SPTableCopy *) getTableCopyFixture { - SPTableCopy *tableCopy = [[SPTableCopy alloc] init]; - return [tableCopy autorelease]; -} - -- (void)testCopyTableFromToWithData { - id mockResult = [self getMockResult]; - unsigned long long varOne = 1; - NSValue *valueOne = [NSValue value:&varOne withObjCType:@encode(__typeof__(varOne))]; - BOOL varNo = NO; - NSValue *valueNo = [NSValue value:&varNo withObjCType:@encode(BOOL)]; - NSArray *resultArray = [[NSArray alloc] initWithObjects:@"", @"CREATE TABLE `table_name` ()", nil]; - [[[mockResult expect] andReturnValue:valueOne] numOfRows]; - [[[mockResult expect] andReturn:resultArray] fetchRowAsArray]; - - id mockConnection = [self getMockConnection]; - [[[mockConnection expect] andReturn:mockResult] queryString:@"SHOW CREATE TABLE `source_db`.`table_name`"]; - [[mockConnection expect] queryString:@"CREATE TABLE `target_db`.`table_name` ()"]; - [[mockConnection expect] queryString:@"INSERT INTO `target_db`.`table_name` SELECT * FROM `source_db`.`table_name`"]; - [[[mockConnection stub] andReturnValue:valueNo] queryErrored]; - - id tableCopy = [self getTableCopyFixture]; - [tableCopy setConnection:mockConnection]; - [tableCopy copyTable: @"table_name" from: @"source_db" to: @"target_db" withContent: YES]; - [mockResult verify]; - [mockConnection verify]; - [resultArray release]; -} - -@end diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 59a8f02a..5ff51aa9 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -7,20 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 112730571180788A000737FD /* SPTableCopyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 112730551180788A000737FD /* SPTableCopyTest.m */; }; - 1127305B11807894000737FD /* SPDatabaseInfoTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1127305911807894000737FD /* SPDatabaseInfoTest.m */; }; - 1141A389117BBFF200126A28 /* SPTableCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1141A388117BBFF200126A28 /* SPTableCopy.m */; }; - 1141A38A117BBFF200126A28 /* SPTableCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1141A388117BBFF200126A28 /* SPTableCopy.m */; }; - 115D63E2117CBC5900419057 /* SPDatabaseInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 115D63E1117CBC5900419057 /* SPDatabaseInfo.m */; }; - 115D63E3117CBC5900419057 /* SPDatabaseInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 115D63E1117CBC5900419057 /* SPDatabaseInfo.m */; }; - 1198F5B31174EDD500670590 /* SPDatabaseCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */; }; - 1198F5C41174EF3F00670590 /* SPDatabaseCopyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1198F5C31174EF3F00670590 /* SPDatabaseCopyTest.m */; }; - 1198F7541174FFCF00670590 /* SPDatabaseCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */; }; - 11B55BFE1189E3B2009EF465 /* SPDBActionCommons.m in Sources */ = {isa = PBXBuildFile; fileRef = 11B55BFD1189E3B2009EF465 /* SPDBActionCommons.m */; }; - 11C211261180EBFF00758039 /* SPDatabaseRenameTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C210DE1180E9B800758039 /* SPDatabaseRenameTest.m */; }; - 11C211271180EC0400758039 /* SPDatabaseRename.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C2109D1180E70800758039 /* SPDatabaseRename.m */; }; - 11C211301180EC9A00758039 /* SPDatabaseRename.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C2109D1180E70800758039 /* SPDatabaseRename.m */; }; - 11D44DF0118F5887002AA43C /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11D44DEF118F5887002AA43C /* OCMock.framework */; }; 171312CE109D23C700FB465F /* SPTableTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 171312CD109D23C700FB465F /* SPTableTextFieldCell.m */; }; 17292443107AC41000B21980 /* SPXMLExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17292442107AC41000B21980 /* SPXMLExporter.m */; }; 172A65110F7BED7A001E861A /* SPConsoleMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 172A65100F7BED7A001E861A /* SPConsoleMessage.m */; }; @@ -44,6 +30,7 @@ 17B7B578101601C300F057DE /* libmysqlclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17B7B576101601C300F057DE /* libmysqlclient.a */; }; 17B7B5901016028F00F057DE /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 17B7B58F1016028F00F057DE /* libcrypto.dylib */; }; 17B7B592101602AE00F057DE /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 17B7B591101602AE00F057DE /* libssl.dylib */; }; + 17B7B594101602D200F057DE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 17B7B593101602D200F057DE /* libz.dylib */; }; 17B7B595101602D800F057DE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; 17B7B5991016038400F057DE /* MCPKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17B7B5621016012700F057DE /* MCPKit.framework */; }; 17B7B5D3101603B200F057DE /* MCPConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 17B7B5C4101603B200F057DE /* MCPConnection.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -151,7 +138,6 @@ 582A01E9107C0C170027D42B /* SPNotLoaded.m in Sources */ = {isa = PBXBuildFile; fileRef = 582A01E8107C0C170027D42B /* SPNotLoaded.m */; }; 582A05A9108A5CCF0027D42B /* ProgressIndicatorLayer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 582A05A7108A5CCF0027D42B /* ProgressIndicatorLayer.xib */; }; 583B77D4103870C800B21F7E /* MCPStreamingResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 583B779810386B0200B21F7E /* MCPStreamingResult.m */; }; - 583CE52D11725642008F148E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 583CE52C11725642008F148E /* libz.dylib */; }; 584095191107CB6600260CFD /* SPAlertSheets.m in Sources */ = {isa = PBXBuildFile; fileRef = 584095181107CB6600260CFD /* SPAlertSheets.m */; }; 5841423F0F97E11000A34B47 /* NoodleLineNumberView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5841423E0F97E11000A34B47 /* NoodleLineNumberView.m */; }; 584192A1101E57BB0089807F /* NSMutableArray-MultipleSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 584192A0101E57BB0089807F /* NSMutableArray-MultipleSort.m */; }; @@ -162,7 +148,6 @@ 586F457E0FDB280100B428D7 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 296DC8BE0F9091DF002A3258 /* libicucore.dylib */; }; 5870868410FA3E9C00D58E1C /* SPDataStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 5870868310FA3E9C00D58E1C /* SPDataStorage.m */; }; 5885940F0F7AEE6000ED0E67 /* sparkle-public-key.pem in Resources */ = {isa = PBXBuildFile; fileRef = 5885940E0F7AEE6000ED0E67 /* sparkle-public-key.pem */; }; - 5885CF4A116A63B200A85ACB /* SPFileHandle.m in Sources */ = {isa = PBXBuildFile; fileRef = 5885CF49116A63B200A85ACB /* SPFileHandle.m */; }; 588B2CC80FE5641E00EC5FC0 /* ssh-connected.png in Resources */ = {isa = PBXBuildFile; fileRef = 588B2CC50FE5641E00EC5FC0 /* ssh-connected.png */; }; 588B2CC90FE5641E00EC5FC0 /* ssh-connecting.png in Resources */ = {isa = PBXBuildFile; fileRef = 588B2CC60FE5641E00EC5FC0 /* ssh-connecting.png */; }; 588B2CCA0FE5641E00EC5FC0 /* ssh-disconnected.png in Resources */ = {isa = PBXBuildFile; fileRef = 588B2CC70FE5641E00EC5FC0 /* ssh-disconnected.png */; }; @@ -267,6 +252,7 @@ BCA6F631100FA7D700E80253 /* FieldEditorSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCA6F62F100FA7D700E80253 /* FieldEditorSheet.xib */; }; BCB56197106F893F00167321 /* ContentFilters.plist in Resources */ = {isa = PBXBuildFile; fileRef = BCB56196106F893F00167321 /* ContentFilters.plist */; }; BCB5619B106F8A1B00167321 /* EditorQuickLookTypes.plist in Resources */ = {isa = PBXBuildFile; fileRef = BCB5619A106F8A1B00167321 /* EditorQuickLookTypes.plist */; }; + BCC5CC3C103EEE49007CE557 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 17B7B593101602D200F057DE /* libz.dylib */; }; BCCBD7FC104408B000D4C50A /* SaveSPFAccessory.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCCBD7FA104408B000D4C50A /* SaveSPFAccessory.xib */; }; BCCDED68115940CB00285E65 /* sync_arrows_01.tiff in Resources */ = {isa = PBXBuildFile; fileRef = BCCDED62115940CB00285E65 /* sync_arrows_01.tiff */; }; BCCDED69115940CB00285E65 /* sync_arrows_02.tiff in Resources */ = {isa = PBXBuildFile; fileRef = BCCDED63115940CB00285E65 /* sync_arrows_02.tiff */; }; @@ -322,25 +308,6 @@ /* Begin PBXFileReference section */ 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; - 112730541180788A000737FD /* SPTableCopyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableCopyTest.h; sourceTree = "<group>"; }; - 112730551180788A000737FD /* SPTableCopyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableCopyTest.m; sourceTree = "<group>"; }; - 1127305811807894000737FD /* SPDatabaseInfoTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseInfoTest.h; sourceTree = "<group>"; }; - 1127305911807894000737FD /* SPDatabaseInfoTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseInfoTest.m; sourceTree = "<group>"; }; - 1141A387117BBFF200126A28 /* SPTableCopy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableCopy.h; sourceTree = "<group>"; }; - 1141A388117BBFF200126A28 /* SPTableCopy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableCopy.m; sourceTree = "<group>"; }; - 115D63E0117CBC5900419057 /* SPDatabaseInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseInfo.h; sourceTree = "<group>"; }; - 115D63E1117CBC5900419057 /* SPDatabaseInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseInfo.m; sourceTree = "<group>"; }; - 1198F5B11174EDD500670590 /* SPDatabaseCopy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseCopy.h; sourceTree = "<group>"; }; - 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseCopy.m; sourceTree = "<group>"; }; - 1198F5C21174EF3F00670590 /* SPDatabaseCopyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseCopyTest.h; sourceTree = "<group>"; }; - 1198F5C31174EF3F00670590 /* SPDatabaseCopyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseCopyTest.m; sourceTree = "<group>"; }; - 11B55BFC1189E3B2009EF465 /* SPDBActionCommons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDBActionCommons.h; sourceTree = "<group>"; }; - 11B55BFD1189E3B2009EF465 /* SPDBActionCommons.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDBActionCommons.m; sourceTree = "<group>"; }; - 11C2109C1180E70800758039 /* SPDatabaseRename.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseRename.h; sourceTree = "<group>"; }; - 11C2109D1180E70800758039 /* SPDatabaseRename.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseRename.m; sourceTree = "<group>"; }; - 11C210DD1180E9B800758039 /* SPDatabaseRenameTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseRenameTest.h; sourceTree = "<group>"; }; - 11C210DE1180E9B800758039 /* SPDatabaseRenameTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseRenameTest.m; sourceTree = "<group>"; }; - 11D44DEF118F5887002AA43C /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = Frameworks/OCMock.framework; sourceTree = "<group>"; }; 17128B8A0FE6E0210035DD75 /* QLPreviewPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QLPreviewPanel.h; sourceTree = "<group>"; }; 1713122F109C7DF600FB465F /* build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = "<group>"; }; 171312CC109D23C700FB465F /* SPTableTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableTextFieldCell.h; sourceTree = "<group>"; }; @@ -385,6 +352,7 @@ 17B7B58B1016022C00F057DE /* MCPKit-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "MCPKit-Info.plist"; sourceTree = "<group>"; }; 17B7B58F1016028F00F057DE /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; }; 17B7B591101602AE00F057DE /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = "<absolute>"; }; + 17B7B593101602D200F057DE /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; }; 17B7B59C101603A400F057DE /* MCPAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCPAttribute.h; sourceTree = "<group>"; }; 17B7B59D101603A400F057DE /* MCPAttribute.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MCPAttribute.m; sourceTree = "<group>"; }; 17B7B59E101603A400F057DE /* MCPClassDescription+MCPEntreprise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MCPClassDescription+MCPEntreprise.h"; sourceTree = "<group>"; }; @@ -577,8 +545,6 @@ 582A05A8108A5CCF0027D42B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Interfaces/English.lproj/ProgressIndicatorLayer.xib; sourceTree = "<group>"; }; 583B779710386B0200B21F7E /* MCPStreamingResult.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = MCPStreamingResult.h; sourceTree = "<group>"; }; 583B779810386B0200B21F7E /* MCPStreamingResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MCPStreamingResult.m; sourceTree = "<group>"; }; - 583CE39C11722B84008F148E /* zlib.1.2.4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zlib.1.2.4.h; path = Frameworks/zlib/zlib.1.2.4.h; sourceTree = SOURCE_ROOT; }; - 583CE52C11725642008F148E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 584094CC1107BD0500260CFD /* SPAlertSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPAlertSheets.h; sourceTree = "<group>"; }; 584095181107CB6600260CFD /* SPAlertSheets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPAlertSheets.m; sourceTree = "<group>"; }; 5841423D0F97E11000A34B47 /* NoodleLineNumberView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoodleLineNumberView.h; sourceTree = "<group>"; }; @@ -592,8 +558,6 @@ 5870868310FA3E9C00D58E1C /* SPDataStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDataStorage.m; sourceTree = "<group>"; }; 588593F30F7AEC9500ED0E67 /* package-application.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "package-application.sh"; sourceTree = "<group>"; }; 5885940E0F7AEE6000ED0E67 /* sparkle-public-key.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "sparkle-public-key.pem"; sourceTree = "<group>"; }; - 5885CF48116A63B200A85ACB /* SPFileHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFileHandle.h; sourceTree = "<group>"; }; - 5885CF49116A63B200A85ACB /* SPFileHandle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFileHandle.m; sourceTree = "<group>"; }; 588B2CC50FE5641E00EC5FC0 /* ssh-connected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ssh-connected.png"; sourceTree = "<group>"; }; 588B2CC60FE5641E00EC5FC0 /* ssh-connecting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ssh-connecting.png"; sourceTree = "<group>"; }; 588B2CC70FE5641E00EC5FC0 /* ssh-disconnected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ssh-disconnected.png"; sourceTree = "<group>"; }; @@ -739,8 +703,8 @@ 17B7B578101601C300F057DE /* libmysqlclient.a in Frameworks */, 17B7B5901016028F00F057DE /* libcrypto.dylib in Frameworks */, 17B7B592101602AE00F057DE /* libssl.dylib in Frameworks */, + 17B7B594101602D200F057DE /* libz.dylib in Frameworks */, 17B7B595101602D800F057DE /* Cocoa.framework in Frameworks */, - 583CE52D11725642008F148E /* libz.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -748,7 +712,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 11D44DF0118F5887002AA43C /* OCMock.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -772,6 +735,7 @@ 4DECC3350EC2A170008D359E /* Sparkle.framework in Frameworks */, 296DC89F0F8FD336002A3258 /* WebKit.framework in Frameworks */, 17B7B5991016038400F057DE /* MCPKit.framework in Frameworks */, + BCC5CC3C103EEE49007CE557 /* libz.dylib in Frameworks */, 58C458DF10CF188F00E6E13E /* libcrypto.dylib in Frameworks */, B52ECDDC10DDACE9009DC3E8 /* BWToolkitFramework.framework in Frameworks */, 586EBD2411418D7C00B3DE45 /* FeedbackReporter.framework in Frameworks */, @@ -793,7 +757,7 @@ 296DC8BE0F9091DF002A3258 /* libicucore.dylib */, 17B7B58F1016028F00F057DE /* libcrypto.dylib */, 17B7B591101602AE00F057DE /* libssl.dylib */, - 583CE52C11725642008F148E /* libz.dylib */, + 17B7B593101602D200F057DE /* libz.dylib */, ); name = "Linked Frameworks"; sourceTree = "<group>"; @@ -801,7 +765,6 @@ 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */ = { isa = PBXGroup; children = ( - 11D44DEF118F5887002AA43C /* OCMock.framework */, 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */, 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */, B5EAC0FC0EC87FF900CC579C /* Security.framework */, @@ -809,46 +772,6 @@ name = "Other Frameworks"; sourceTree = "<group>"; }; - 1198F5B01174EDA700670590 /* DatabaseActions */ = { - isa = PBXGroup; - children = ( - 1198F5B11174EDD500670590 /* SPDatabaseCopy.h */, - 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */, - 1141A387117BBFF200126A28 /* SPTableCopy.h */, - 1141A388117BBFF200126A28 /* SPTableCopy.m */, - 115D63E0117CBC5900419057 /* SPDatabaseInfo.h */, - 115D63E1117CBC5900419057 /* SPDatabaseInfo.m */, - 11C2109C1180E70800758039 /* SPDatabaseRename.h */, - 11C2109D1180E70800758039 /* SPDatabaseRename.m */, - 11B55BFC1189E3B2009EF465 /* SPDBActionCommons.h */, - 11B55BFD1189E3B2009EF465 /* SPDBActionCommons.m */, - ); - name = DatabaseActions; - sourceTree = "<group>"; - }; - 1198F5B41174EDDE00670590 /* Other */ = { - isa = PBXGroup; - children = ( - 1198F5B51174EDE400670590 /* DatabaseActions */, - ); - name = Other; - sourceTree = "<group>"; - }; - 1198F5B51174EDE400670590 /* DatabaseActions */ = { - isa = PBXGroup; - children = ( - 1198F5C21174EF3F00670590 /* SPDatabaseCopyTest.h */, - 1198F5C31174EF3F00670590 /* SPDatabaseCopyTest.m */, - 112730541180788A000737FD /* SPTableCopyTest.h */, - 112730551180788A000737FD /* SPTableCopyTest.m */, - 1127305811807894000737FD /* SPDatabaseInfoTest.h */, - 1127305911807894000737FD /* SPDatabaseInfoTest.m */, - 11C210DD1180E9B800758039 /* SPDatabaseRenameTest.h */, - 11C210DE1180E9B800758039 /* SPDatabaseRenameTest.m */, - ); - name = DatabaseActions; - sourceTree = "<group>"; - }; 17128B890FE6DFFA0035DD75 /* QuickLook */ = { isa = PBXGroup; children = ( @@ -1260,10 +1183,8 @@ 17E6416E0EF01F3B001BC333 /* Other */ = { isa = PBXGroup; children = ( - 1198F5B01174EDA700670590 /* DatabaseActions */, 296DC8A40F90914B002A3258 /* MGTemplateEngine */, 17128B890FE6DFFA0035DD75 /* QuickLook */, - 583CE39511722B70008F148E /* Compression */, 173284E51088FEC20062E892 /* Data */, 17E6416F0EF01F4C001BC333 /* Keychain */, 58FEF15E0F23D60A00518E8E /* Parsing */, @@ -1511,7 +1432,6 @@ 380F4EF20FC0B67A00B0BFD7 /* Unit Tests */ = { isa = PBXGroup; children = ( - 1198F5B41174EDDE00670590 /* Other */, 380F4F230FC0C3D300B0BFD7 /* MCPKitTest.h */, 380F4F240FC0C3D300B0BFD7 /* MCPKitTest.m */, 380F4EF30FC0B68F00B0BFD7 /* SPStringAdditionsTest.h */, @@ -1521,16 +1441,6 @@ path = UnitTests; sourceTree = "<group>"; }; - 583CE39511722B70008F148E /* Compression */ = { - isa = PBXGroup; - children = ( - 583CE39C11722B84008F148E /* zlib.1.2.4.h */, - 5885CF48116A63B200A85ACB /* SPFileHandle.h */, - 5885CF49116A63B200A85ACB /* SPFileHandle.m */, - ); - name = Compression; - sourceTree = "<group>"; - }; 58DA884E103E1597000B98DF /* Debugging & Support */ = { isa = PBXGroup; children = ( @@ -1886,16 +1796,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 11C211271180EC0400758039 /* SPDatabaseRename.m in Sources */, - 11C211261180EBFF00758039 /* SPDatabaseRenameTest.m in Sources */, - 1141A38A117BBFF200126A28 /* SPTableCopy.m in Sources */, - 115D63E3117CBC5900419057 /* SPDatabaseInfo.m in Sources */, - 112730571180788A000737FD /* SPTableCopyTest.m in Sources */, - 1127305B11807894000737FD /* SPDatabaseInfoTest.m in Sources */, - 1198F7541174FFCF00670590 /* SPDatabaseCopy.m in Sources */, 380F4EF50FC0B68F00B0BFD7 /* SPStringAdditionsTest.m in Sources */, 380F4F250FC0C3D300B0BFD7 /* MCPKitTest.m in Sources */, - 1198F5C41174EF3F00670590 /* SPDatabaseCopyTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1913,7 +1815,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 11C211301180EC9A00758039 /* SPDatabaseRename.m in Sources */, 17E641460EF01EB5001BC333 /* main.m in Sources */, 17E641560EF01EF6001BC333 /* CustomQuery.m in Sources */, 17E641570EF01EF6001BC333 /* SPAppController.m in Sources */, @@ -1996,11 +1897,6 @@ BC2777A011514B940034DF6A /* SPNavigatorController.m in Sources */, 589582151154F8F400EDCC28 /* SPMainThreadTrampoline.m in Sources */, BC4DF1981158FB280059FABD /* SPNavigatorOutlineView.m in Sources */, - 5885CF4A116A63B200A85ACB /* SPFileHandle.m in Sources */, - 1198F5B31174EDD500670590 /* SPDatabaseCopy.m in Sources */, - 1141A389117BBFF200126A28 /* SPTableCopy.m in Sources */, - 115D63E2117CBC5900419057 /* SPDatabaseInfo.m in Sources */, - 11B55BFE1189E3B2009EF465 /* SPDBActionCommons.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2268,7 +2164,6 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\"", - "\"$(SRCROOT)/Frameworks/zlib\"", ); OTHER_LDFLAGS = ( "-framework", @@ -2298,7 +2193,6 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\"", - "\"$(SRCROOT)/Frameworks/zlib\"", ); OTHER_LDFLAGS = ( "-framework", @@ -2327,7 +2221,6 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\"", - "\"$(SRCROOT)/Frameworks/zlib\"", ); OTHER_LDFLAGS = ( "-framework", @@ -2349,7 +2242,6 @@ FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_LIBRARY_DIR)/Frameworks", "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -2384,7 +2276,6 @@ FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_LIBRARY_DIR)/Frameworks", "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", ); GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -2415,7 +2306,6 @@ FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_LIBRARY_DIR)/Frameworks", "\"$(SRCROOT)/Frameworks\"", - "\"$(SRCROOT)\"", ); GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -2443,37 +2333,8 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = c99; - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO; - GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; - GCC_WARN_PEDANTIC = NO; - GCC_WARN_PROTOTYPE_CONVERSION = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = NO; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; IBC_WARNINGS = YES; PREBINDING = NO; @@ -2498,11 +2359,7 @@ GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\"", - "\"$(SRCROOT)/Frameworks/zlib\"", - ); - OTHER_LDFLAGS = "$(SRCROOT)/Frameworks/zlib/libz.a"; + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\""; PRODUCT_NAME = "Sequel Pro"; SEPARATE_STRIP = NO; }; @@ -2592,14 +2449,7 @@ GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\"", - "\"$(SRCROOT)/Frameworks/zlib\"", - ); - OTHER_LDFLAGS = ( - "$(SRCROOT)/Frameworks/zlib/libz.a", - "-lcrypto", - ); + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\""; PRODUCT_NAME = "Sequel Pro"; SEPARATE_STRIP = NO; }; @@ -2621,14 +2471,7 @@ GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\"", - "\"$(SRCROOT)/Frameworks/zlib\"", - ); - OTHER_LDFLAGS = ( - "$(SRCROOT)/Frameworks/zlib/libz.a", - "-lcrypto", - ); + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\""; PRODUCT_NAME = "Sequel Pro"; SEPARATE_STRIP = NO; }; @@ -2642,44 +2485,14 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO; - GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; - GCC_WARN_PEDANTIC = NO; - GCC_WARN_PROTOTYPE_CONVERSION = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = NO; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; IBC_FLATTEN_NIBS = NO; IBC_WARNINGS = YES; LEXFLAGS = ""; LEX_INSERT_LINE_DIRECTIVES = YES; LEX_SUPPRESS_DEFAULT_RULE = NO; - LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lcrypto"; PREBINDING = NO; @@ -2695,37 +2508,8 @@ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = c99; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO; - GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; - GCC_WARN_PEDANTIC = NO; - GCC_WARN_PROTOTYPE_CONVERSION = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = NO; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; IBC_WARNINGS = YES; OTHER_LDFLAGS = "-lcrypto"; |