Bring outline view branch up to date with trunk.

1 files changed, 8 insertions, 122 deletions

diff --git a/Source/SPExportController.m b/Source/SPExportController.m
index 17720928..ace630b6 100644
--- a/Source/SPExportController.m
+++ b/Source/SPExportController.m
@@ -34,7 +34,7 @@
 #import "SPExportFilenameUtilities.h"
 #import "SPExportFileNameTokenObject.h"
 #import "SPDatabaseDocument.h"
-#import "SPMySQL.h"
+#import <SPMySQL/SPMySQL.h>
 
 // Constants
 static const NSUInteger SPExportUIPadding = 20;
@@ -615,6 +615,7 @@ static const NSString *SPSQLExportDropEnabled         = @"SQLExportDropEnabled";
 - (IBAction)toggleNewFilePerTable:(NSButton *)sender
 {
 	[self _updateExportFormatInformation];
+	[self updateAvailableExportFilenameTokens];
 }
 
 /**
@@ -835,7 +836,7 @@ static const NSString *SPSQLExportDropEnabled         = @"SQLExportDropEnabled";
 	}
 		
 	if (j > i) {
-		NSUInteger diff = (j - i);
+		NSUInteger diff = j - i;
 		
 		SPBeginAlertSheet(NSLocalizedString(@"The list of tables has changed", @"table list change alert message"), 
 						  NSLocalizedString(@"Continue", @"continue button"), 
@@ -975,9 +976,9 @@ static const NSString *SPSQLExportDropEnabled         = @"SQLExportDropEnabled";
 	BOOL isHTML = (exportType == SPHTMLExport);
 	BOOL isPDF  = (exportType == SPPDFExport);
 	
-	BOOL structureEnabled = [[uiStateDict objectForKey:SPSQLExportStructureEnabled] integerValue];
-	BOOL contentEnabled   = [[uiStateDict objectForKey:SPSQLExportContentEnabled] integerValue];
-	BOOL dropEnabled      = [[uiStateDict objectForKey:SPSQLExportDropEnabled] integerValue];
+	BOOL structureEnabled = [[uiStateDict objectForKey:SPSQLExportStructureEnabled] boolValue];
+	BOOL contentEnabled   = [[uiStateDict objectForKey:SPSQLExportContentEnabled] boolValue];
+	BOOL dropEnabled      = [[uiStateDict objectForKey:SPSQLExportDropEnabled] boolValue];
 		
 	if (isCSV || isXML || isHTML || isPDF || (isSQL && ((!structureEnabled) || (!dropEnabled)))) {
 		enable = NO;
@@ -1012,8 +1013,8 @@ static const NSString *SPSQLExportDropEnabled         = @"SQLExportDropEnabled";
 				}
 			}
 		}
-		// Disable if structure is unchecked, but content and drop are as dropping a table then trying to insert
-		// into it is obviously an error.
+		// Disable if structure is unchecked, but content and drop are as dropping a 
+		// table then trying to insert into it is obviously an error.
 		else if (contentEnabled && (!structureEnabled) && (dropEnabled)) {
 			enable = NO;
 		}
@@ -1053,119 +1054,4 @@ static const NSString *SPSQLExportDropEnabled         = @"SQLExportDropEnabled";
 	[exportButton setEnabled:[enable boolValue]];
 }
 
-/**
- * Resizes the export window's height by the supplied delta, while retaining the position of 
- * all interface controls to accommodate the custom filename view.
- *
- * @param delta The height delta for which the height should be adjusted for.
- */
-- (void)_resizeWindowForCustomFilenameViewByHeightDelta:(NSInteger)delta
-{
-	NSUInteger popUpMask              = [exportInputPopUpButton autoresizingMask];
-	NSUInteger fileCheckMask          = [exportFilePerTableCheck autoresizingMask];
-	NSUInteger scrollMask             = [exportTablelistScrollView autoresizingMask];
-	NSUInteger buttonBarMask          = [exportTableListButtonBar autoresizingMask];
-	NSUInteger buttonMask             = [exportCustomFilenameViewButton autoresizingMask];
-	NSUInteger textFieldMask          = [exportCustomFilenameViewLabelButton autoresizingMask];
-	NSUInteger customFilenameViewMask = [exportCustomFilenameView autoresizingMask];
-	NSUInteger tabBarMask             = [exportOptionsTabBar autoresizingMask];
-	
-	NSRect frame = [[self window] frame];
-	
-	if (frame.size.height > 600 && delta > heightOffset1) {
-		frame.origin.y += [exportCustomFilenameView frame].size.height;
-		frame.size.height -= [exportCustomFilenameView frame].size.height;
-		
-		[[self window] setFrame:frame display:YES animate:YES];
-	}
-	
-	[exportInputPopUpButton setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin];
-	[exportFilePerTableCheck setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin];
-	[exportTablelistScrollView setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin];
-	[exportTableListButtonBar setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin];
-	[exportOptionsTabBar setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin];
-	[exportCustomFilenameViewButton setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	[exportCustomFilenameViewLabelButton setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	[exportCustomFilenameView setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	
-	NSInteger newMinHeight = (windowMinHeigth - heightOffset1 + delta < windowMinHeigth) ? windowMinHeigth : windowMinHeigth - heightOffset1 + delta;
-	
-	[[self window] setMinSize:NSMakeSize(windowMinWidth, newMinHeight)];
-	
-	frame.origin.y += heightOffset1;
-	frame.size.height -= heightOffset1;
-	
-	heightOffset1 = delta;
-	
-	frame.origin.y -= heightOffset1;
-	frame.size.height += heightOffset1;
-	
-	[[self window] setFrame:frame display:YES animate:YES];
-	
-	[exportInputPopUpButton setAutoresizingMask:popUpMask];
-	[exportFilePerTableCheck setAutoresizingMask:fileCheckMask];
-	[exportTablelistScrollView setAutoresizingMask:scrollMask];
-	[exportTableListButtonBar setAutoresizingMask:buttonBarMask];
-	[exportCustomFilenameViewButton setAutoresizingMask:buttonMask];
-	[exportCustomFilenameViewLabelButton setAutoresizingMask:textFieldMask];
-	[exportCustomFilenameView setAutoresizingMask:customFilenameViewMask];
-	[exportOptionsTabBar setAutoresizingMask:tabBarMask];
-}
-
-/**
- * Resizes the export window's height by the supplied delta, while retaining the position of 
- * all interface controls to accommodate the advanced options view.
- *
- * @param delta The height delta for which the height should be adjusted for.
- */
-- (void)_resizeWindowForAdvancedOptionsViewByHeightDelta:(NSInteger)delta
-{
-	NSUInteger scrollMask        = [exportTablelistScrollView autoresizingMask];
-	NSUInteger buttonBarMask     = [exportTableListButtonBar autoresizingMask];
-	NSUInteger tabBarMask        = [exportTypeTabBar autoresizingMask];
-	NSUInteger optionsTabBarMask = [exportOptionsTabBar autoresizingMask];
-	NSUInteger buttonMask        = [exportAdvancedOptionsViewButton autoresizingMask];
-	NSUInteger textFieldMask     = [exportAdvancedOptionsViewLabelButton autoresizingMask];
-	NSUInteger advancedViewMask  = [exportAdvancedOptionsView autoresizingMask];
-	
-	NSRect frame = [[self window] frame];
-	
-	if (frame.size.height > 600 && delta > heightOffset2) {
-		frame.origin.y += [exportAdvancedOptionsView frame].size.height;
-		frame.size.height -= [exportAdvancedOptionsView frame].size.height;
-		
-		[[self window] setFrame:frame display:YES animate:YES];
-	}
-	
-	[exportTablelistScrollView setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	[exportTableListButtonBar setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	[exportTypeTabBar setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	[exportOptionsTabBar setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	[exportAdvancedOptionsViewButton setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	[exportAdvancedOptionsViewLabelButton setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	[exportAdvancedOptionsView setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
-	
-	NSInteger newMinHeight = (windowMinHeigth - heightOffset2 + delta < windowMinHeigth) ? windowMinHeigth : windowMinHeigth - heightOffset2 + delta;
-	
-	[[self window] setMinSize:NSMakeSize(windowMinWidth, newMinHeight)];
-	
-	frame.origin.y += heightOffset2;
-	frame.size.height -= heightOffset2;
-	
-	heightOffset2 = delta;
-	
-	frame.origin.y -= heightOffset2;
-	frame.size.height += heightOffset2;
-	
-	[[self window] setFrame:frame display:YES animate:YES];
-	
-	[exportTablelistScrollView setAutoresizingMask:scrollMask];
-	[exportTableListButtonBar setAutoresizingMask:buttonBarMask];
-	[exportTypeTabBar setAutoresizingMask:tabBarMask];
-	[exportOptionsTabBar setAutoresizingMask:optionsTabBarMask];
-	[exportAdvancedOptionsViewButton setAutoresizingMask:buttonMask];
-	[exportAdvancedOptionsViewLabelButton setAutoresizingMask:textFieldMask];
-	[exportAdvancedOptionsView setAutoresizingMask:advancedViewMask];
-}
-
 @end