diff options
| author | Rowan Beentje <rowan@beent.je> | 2013-11-10 15:12:42 -0800 |
|---|---|---|
| committer | Rowan Beentje <rowan@beent.je> | 2013-11-10 15:12:42 -0800 |
| commit | 0dfc594adaafa38a3cee794d67e1583e2627ca02 (patch) | |
| tree | 7299be271ea57dd72af5ec4ce3a43e4b0e73219d /Source | |
| parent | aad0b2000b15891b855ad69f02e2dc12d660ca86 (diff) | |
| parent | 7ae31e80623186465fa94e8e517fe0d56b32477f (diff) | |
| download | sequelpro-0dfc594adaafa38a3cee794d67e1583e2627ca02.tar.gz sequelpro-0dfc594adaafa38a3cee794d67e1583e2627ca02.tar.bz2 sequelpro-0dfc594adaafa38a3cee794d67e1583e2627ca02.zip | |
Merge pull request #1851 from rowanbeentje/master
Add the XIB support for Multiple Table Content Filters (Issue #63)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/SPTableContent.h | 3 | ||||
| -rw-r--r-- | Source/SPTableContent.m | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index ab62b87f..131b4313 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -112,6 +112,9 @@ IBOutlet NSButton *filterTableSearchAllFields; IBOutlet NSPanel *filterTableSetDefaultOperatorSheet; IBOutlet NSComboBox* filterTableSetDefaultOperatorValue; + + // Temporary to avoid nib conflicts during WIP + IBOutlet SPSplitView *contentSplitView; #endif SPMySQLConnection *mySQLConnection; diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index fa7b9a2c..17efd5ae 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -215,6 +215,11 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper _mainNibLoaded = YES; #ifndef SP_CODA /* ui manipulation */ + // Temporary to avoid nib conflicts during WIP + [contentSplitView setCollapsibleSubviewIndex:0]; + [contentSplitView setCollapsibleSubviewCollapsed:YES animate:NO]; + [contentSplitView setMaxSize:0.f ofSubviewAtIndex:0]; + // Set the table content view's vertical gridlines if required [tableContentView setGridStyleMask:([prefs boolForKey:SPDisplayTableViewVerticalGridlines]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; [filterTableView setGridStyleMask:([prefs boolForKey:SPDisplayTableViewVerticalGridlines]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; |