diff options
| author | stuconnolly <stuart02@gmail.com> | 2010-09-18 14:49:01 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2010-09-18 14:49:01 +0000 |
| commit | ae8935e94513139f2ea0d10cba6757fef14fa86d (patch) | |
| tree | 723b529a509e068c16825d13d193fb53327fda0f | |
| parent | db8ab76fad224642ded1de75bf531763e2acfffb (diff) | |
| download | sequelpro-ae8935e94513139f2ea0d10cba6757fef14fa86d.tar.gz sequelpro-ae8935e94513139f2ea0d10cba6757fef14fa86d.tar.bz2 sequelpro-ae8935e94513139f2ea0d10cba6757fef14fa86d.zip | |
Add index sheet:
- Fix an exception caused when cancelling adding an index with the advanced options view open.
- Move 'Cancel and 'Add' buttons to be inline with index type and name controls.
Both found/suggested by Rowan.
| -rw-r--r-- | Interfaces/English.lproj/IndexesView.xib | 10 | ||||
| -rw-r--r-- | Source/SPIndexesController.m | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Interfaces/English.lproj/IndexesView.xib b/Interfaces/English.lproj/IndexesView.xib index 98344fbb..9a236e98 100644 --- a/Interfaces/English.lproj/IndexesView.xib +++ b/Interfaces/English.lproj/IndexesView.xib @@ -21,7 +21,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="55"/> + <integer value="4"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -681,7 +681,7 @@ <object class="NSButton" id="587008277"> <reference key="NSNextResponder" ref="762677578"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{132, 13}, {100, 28}}</string> + <string key="NSFrame">{{152, 13}, {100, 28}}</string> <reference key="NSSuperview" ref="762677578"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> @@ -707,7 +707,7 @@ <object class="NSButton" id="948801180"> <reference key="NSNextResponder" ref="762677578"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{34, 13}, {100, 28}}</string> + <string key="NSFrame">{{54, 13}, {100, 28}}</string> <reference key="NSSuperview" ref="762677578"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="758521208"> @@ -1624,9 +1624,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{695, 411}, {267, 274}}</string> + <string>{{512, 335}, {267, 274}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{695, 411}, {267, 274}}</string> + <string>{{512, 335}, {267, 274}}</string> <integer value="1"/> <integer value="0"/> <integer value="1"/> diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m index 80e8434c..9cc7f1d1 100644 --- a/Source/SPIndexesController.m +++ b/Source/SPIndexesController.m @@ -146,6 +146,12 @@ NSString *SPNewIndexStorageType = @"IndexStorageType"; } } + // Reset the indexed columns + [indexedFields removeAllObjects]; + [indexedFields addObject:[[[fields objectAtIndex:0] copy] autorelease]]; + + [indexedColumnsTableView reloadData]; + [addIndexedColumnButton setEnabled:([indexedFields count] < [fields count])]; // Index storage types (HASH & BTREE) are only available some storage engines @@ -247,17 +253,11 @@ NSString *SPNewIndexStorageType = @"IndexStorageType"; // Hide the size column [indexSizeTableColumn setHidden:YES]; - - // Reset the indexed columns - [indexedFields removeAllObjects]; - [indexedFields addObject:[[[fields objectAtIndex:0] copy] autorelease]]; [self _resizeWindowForAdvancedOptionsViewByHeightDelta:0]; [NSApp endSheet:[sender window] returnCode:[sender tag]]; - [[sender window] orderOut:self]; - - [self _reloadIndexedColumnsTableData]; + [[sender window] orderOut:self]; } /** |