- Remove all BWToolKit elements from the ExportDialog, DatabaseServerVariables, Navigator, and IndexesView nibs, replacing with SPSplitView and standard equivalents

4 files changed, 9 insertions, 15 deletions

diff --git a/Source/SPExportController.h b/Source/SPExportController.h
index aee3861d..27050f65 100644
--- a/Source/SPExportController.h
+++ b/Source/SPExportController.h
@@ -36,7 +36,6 @@
 @class SPTablesList;
 @class SPTableData;
 @class SPMySQLConnection; 
-@class BWAnchoredButtonBar;
 
 /**
  * @class SPExportController SPExportController.h
@@ -81,7 +80,7 @@
 	IBOutlet NSButton *exportProcessLowMemoryButton;
 	IBOutlet NSPopUpButton *exportOutputCompressionFormatPopupButton;
 	
-	IBOutlet BWAnchoredButtonBar *exportTableListButtonBar;
+	IBOutlet NSBox *exportTableListButtonBar;
 	
 	// Export progress sheet
 	IBOutlet NSWindow *exportProgressWindow;
diff --git a/Source/SPIndexesController.h b/Source/SPIndexesController.h
index 7e2ed9e7..2338f8a6 100644
--- a/Source/SPIndexesController.h
+++ b/Source/SPIndexesController.h
@@ -30,22 +30,12 @@
 //
 //  More info at <http://code.google.com/p/sequel-pro/>
 
-#ifndef SP_REFACTOR
-@class SPDatabaseDocument;
-@class SPTablesList;
-@class SPTableData;
-@class SPTableStructure;
-@class SPMySQLConnection;
-@class BWAnchoredButtonBar;
-@class SPTableView;
-#else
 @class SPDatabaseDocument;
 @class SPTablesList;
 @class SPTableData;
 @class SPTableStructure;
 @class SPMySQLConnection;
 @class SPTableView;
-#endif
 
 @interface SPIndexesController : NSWindowController 
 #ifdef SP_REFACTOR
@@ -75,7 +65,7 @@
 	IBOutlet NSButton *removeIndexedColumnButton;
 	IBOutlet NSButton *confirmAddIndexButton;
 #ifndef SP_REFACTOR
-	IBOutlet BWAnchoredButtonBar *anchoredButtonBar;
+	IBOutlet NSBox *anchoredButtonBar;
 	
 	// Advanced options view
 	IBOutlet NSButton *indexAdvancedOptionsViewButton;
diff --git a/Source/SPNavigatorController.h b/Source/SPNavigatorController.h
index 928d19c6..b6588c5a 100644
--- a/Source/SPNavigatorController.h
+++ b/Source/SPNavigatorController.h
@@ -30,7 +30,7 @@
 //
 //  More info at <http://code.google.com/p/sequel-pro/>
 
-@class SPNavigatorOutlineView;
+@class SPNavigatorOutlineView, SPSplitView;
 
 @interface SPNavigatorController : NSWindowController 
 {
@@ -41,7 +41,7 @@
 	IBOutlet id searchField;
 	IBOutlet NSButton *syncButton;
 
-	IBOutlet id schemaStatusSplitView;
+	IBOutlet SPSplitView *schemaStatusSplitView;
 	IBOutlet id schema12SplitView;
 
 	NSUserDefaults *prefs;
diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m
index d4b193be..2b9fe902 100644
--- a/Source/SPNavigatorController.m
+++ b/Source/SPNavigatorController.m
@@ -31,6 +31,7 @@
 //  More info at <http://code.google.com/p/sequel-pro/>
 
 #import "SPNavigatorController.h"
+#import "SPSplitView.h"
 #ifndef SP_REFACTOR /* headers */
 #import "RegexKitLite.h"
 #import "SPNavigatorOutlineView.h"
@@ -150,6 +151,10 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte
 {
 	prefs = [NSUserDefaults standardUserDefaults];
 
+	// Set up the splitview
+	[schemaStatusSplitView setMinSize:32.f ofSubviewAtIndex:0];
+	[schemaStatusSplitView setMinSize:16.f ofSubviewAtIndex:1];
+
 	[self setWindowFrameAutosaveName:@"SPNavigator"];
 	[outlineSchema2 registerForDraggedTypes:[NSArray arrayWithObjects:SPNavigatorTableDataPasteboardDragType, SPNavigatorPasteboardDragType, NSStringPboardType, nil]];
 	[outlineSchema2 setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];