From 7dfafb60062fc150f71bba694810cd8d328efd00 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Fri, 17 Sep 2010 20:06:37 +0000 Subject: New add index sheet, which includes: - The ability to easily index multiple columns - The ability to specify the storage type (HASH or BTREE) that should be used when available and permitted - The ability to specify a length prefix when indexing a specific column (required on TEXT columns) Requires lots of testing. --- Interfaces/English.lproj/IndexesView.xib | 1581 +++++++++++++++++++++++++----- 1 file changed, 1321 insertions(+), 260 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/IndexesView.xib b/Interfaces/English.lproj/IndexesView.xib index dc8f2e2d..98344fbb 100644 --- a/Interfaces/English.lproj/IndexesView.xib +++ b/Interfaces/English.lproj/IndexesView.xib @@ -7,15 +7,25 @@ 1038.29 461.00 - com.apple.InterfaceBuilder.CocoaPlugin - 788 + YES + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit + + + YES + 788 + 1.2.5 + YES - + YES + com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin @@ -39,17 +49,17 @@ NSApplication - 1 + 9 2 - {{512, 379}, {267, 139}} + {{512, 244}, {267, 274}} 1886913536 New Index NSWindow View - {1.79769e+308, 1.79769e+308} - {213, 107} + {3.40282e+38, 3.40282e+38} + {267, 274} 256 @@ -57,8 +67,8 @@ YES - 256 - {{122, 98}, {128, 22}} + 268 + {{83, 233}, {167, 22}} YES @@ -79,18 +89,18 @@ 400 75 - + - PRIMARY KEY + INDEX 1048576 2147483647 1 - + NSImage NSMenuCheckmark - + NSImage NSMenuMixedState @@ -104,26 +114,15 @@ YES - - - - INDEX - - 1048576 - 2147483647 - - - _popUpItemAction: - - + UNIQUE 1048576 2147483647 - - + + _popUpItemAction: @@ -133,8 +132,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -148,8 +147,8 @@ - 256 - {{125, 76}, {122, 19}} + 266 + {{86, 211}, {161, 19}} YES @@ -182,8 +181,8 @@ - 256 - {{-3, 78}, {123, 14}} + 268 + {{17, 213}, {64, 14}} YES @@ -198,7 +197,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -211,8 +210,8 @@ - 256 - {{-3, 103}, {123, 14}} + 268 + {{17, 238}, {64, 14}} YES @@ -225,121 +224,464 @@ - + - 256 - {{125, 48}, {125, 22}} - - YES - - 343014976 - 132096 - - - - - - YES - - - 5 - YES - YES - - - - 274 - {15, 0} - - - YES - + 274 + + YES + + + 2304 + YES - - - 12 - 10 - 1000 - - 75628032 - 0 - - - LucidaGrande - 12 - 16 + + + 256 + {267, 80} + + YES + + + 256 + {267, 17} + + + + + + -2147483392 + {{224, 0}, {16, 17}} + + + + YES + + name + 264 + 40 + 1000 + + 75628096 + 2048 + Field + + + 3 + MC4zMzMzMzI5ODU2AA + + + 6 + System + headerTextColor + + + + + 70385217 + 272761856 + + + + + + 5 + YES + YES + + + + 274 + {15, 0} + + + YES + + YES + + + 12 + 10 + 1000 + + 75628032 + 0 + + + LucidaGrande + 12 + 16 + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 1024 + + + YES + + 6 + System + controlBackgroundColor + + + + + 3 + YES + + + + 3 + 2 + + + 6 + System + gridColor + + 3 + MC41AA + + + 16 + tableViewAction: + -767524864 + + + 1 + 15 + 0 + YES + 0 + + NO + + 1 + YES + - - 3 - MC4zMzMzMzI5ODU2AA + + Size + 76 + 40 + 1000 + + 75628096 + 2048 + Size + + + + + + 337772096 + 133120 + Text Cell + + optional + + + + + YES + + YES - - - 338820672 - 1024 - - - YES - - 6 - System - controlBackgroundColor - + 3 + 2 + + + 14 + 46137344 + + + 1 + 4 + 15 + 0 + NO + 0 + + + {{1, 17}, {267, 80}} + + + + + 4 + + + + -2147483392 + {{224, 17}, {15, 102}} + + + _doScroller: + 0.80263155698776245 + + + + -2147483392 + {{-100, -100}, {225, 11}} + + 257 + + _doScroller: + 0.99557524919509888 + + + + 2304 + + YES + + + {{1, 0}, {267, 17}} + + + + + 4 + + + + {{-1, 97}, {269, 98}} + + + 530 + + + + + + QSAAAEEgAABBgAAAQYAAAA + + + + -2147483358 + + YES + + + 34 + + YES + + + 256 + + YES + + + 268 + {{15, 16}, {78, 14}} + + YES + + 68288064 + 272761856 + Storage Type: + + + + + + + + + 268 + {{95, 11}, {168, 22}} + + YES + + -2076049856 + 133120 + + + 109199615 + 129 + + + 400 + 75 + + + Default + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + + + + BTREE + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + HASH + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + LucidaGrande + 13 + 1044 + + + 1 + YES + YES + 2 + - - 3 - YES - + {{1, 1}, {278, 45}} + - 3 - 2 - - - 6 - System - gridColor - + {{-5, -4}, {280, 47}} + + {0, 0} + + 67239424 + 0 + Box + + + 3 - MC41AA + MCAwLjgwMDAwMDAxMTkAA + + + + 1 + 0 + 0 + NO + + + + 268 + {{-83, 15}, {100, 18}} + + YES + + 67239424 + 131072 + + + + 1211912703 + 2 + + NSImage + NSSwitch + + NSSwitch + + + + 200 + 25 - 16 - tableViewAction: - -767524864 - - - - 1 - 15 - 0 - YES - 0 + {{-2, -4}, {272, 41}} + + NSView - + - 256 - {{-3, 52}, {123, 14}} + 292 + {{0, 40}, {29, 26}} YES - + 67239424 - 71303168 - Indexed Columns: + 134217728 + + + + -1195491073 + 402653253 + + + a + 400 + 75 + + + + + 292 + {{24, 41}, {214, 22}} + + YES + + -2080244224 + 131072 + Advanced - - - + + -2046410497 + 1 + + LucidaGrande-Bold + 11 + 16 + + + + 400 + 75 - 256 - {{152, 13}, {100, 28}} + 289 + {{132, 13}, {100, 28}} 1 YES @@ -364,8 +706,8 @@ - 256 - {{54, 13}, {100, 28}} + 289 + {{34, 13}, {100, 28}} YES @@ -383,13 +725,88 @@ 25 + + + 290 + + YES + + + 268 + {{1, 0}, {32, 24}} + + YES + + 67239424 + 134348800 + + + + -2033958657 + 163 + + NSImage + NSAddTemplate + + + + 200 + 25 + + + + + 268 + {{32, 0}, {32, 24}} + + YES + + 604110336 + 134348800 + + + + -2033434369 + 163 + + NSImage + NSRemoveTemplate + + + + 200 + 25 + + + + {{-2, 74}, {270, 24}} + + NO + NO + NO + 2 + - {267, 139} + {267, 274} {{0, 0}, {1680, 1028}} - {213, 129} - {1.79769e+308, 1.79769e+308} + {267, 296} + {3.40282e+38, 3.40282e+38} + + + + + YES + + + Remove Field + + 2147483647 + + + + @@ -437,51 +854,211 @@ - indexedColumnsComboBox - - + delegate + + - 32 + 35 closeSheet: - + - 33 + 84 closeSheet: + + + 85 + + + + indexAdvancedOptionsViewButton + + + + 94 + + + + indexAdvancedOptionsViewLabelButton + + + + 95 + + + + indexedColumnsScrollView + + + + 96 + + + + indexedColumnsTableView + + + + 97 + + + + addIndexButton + - 34 + 98 - delegate - + indexAdvancedOptionsView + + + + 99 + + + + toggleAdvancedIndexOptionsView: + + + + 100 + + + + toggleAdvancedIndexOptionsView: + + + + 101 + + + + indexNameLabel + + + + 103 + + + + indexTypeLabel + + + + 104 + + + + indexSizeTableColumn + + + + 112 + + + + addIndexedColumnButton + + + + 113 + + + + removeIndexedColumnButton + + + + 114 + + + + indexStorageTypePopUpButton + + + + 115 + + + + addIndexedField: + + + + 118 + + + + removeIndexedField: + + + + 119 + + + + dataSource + - 35 + 120 delegate - + - 36 + 121 - addIndexButton + dataSource + + + + 122 + + + + removeIndexedField: + + + + 127 + + + + menu + + + + 128 + + + + confirmAddIndexButton - 37 + 130 + + + + anchoredButtonBar + + + + 131 @@ -526,26 +1103,20 @@ YES - - - + + + + + + - - 5 - - - YES - - - - 6 @@ -565,16 +1136,198 @@ - 8 - + 11 + + + YES + + + + + + 12 + + + YES + + + + + + 13 + + + YES + + + + + + 14 + + + YES + + + + + + + + 17 + + + + + 18 + + + + + 19 + + + + + 23 + + + + + 24 + + + + + 52 + + + YES + + + + + + + + + 53 + + + + + 54 + + + + + 55 + + + YES + + + + + + + 56 + + + + + 57 + + + YES + + + + + + 58 + + + YES + + + + + + 59 + + + + + 61 + + + + + 62 + + + YES + + + + + Advanced View for INSERT + + + 63 + + + YES + + + + + + 66 + + + + + 67 + + + YES + + + + + + + 68 + + + YES + + + + + + 69 + + + + + 64 + YES - + - 9 + 65 + + + + + 80 YES @@ -583,107 +1336,145 @@ - 10 - + 81 + YES - + - 11 - + 82 + + + + + 83 + + + + + 92 + YES - + - + - 12 - + 93 + + + + + 86 + YES - + - + - 13 - + 87 + YES - + - + - 14 - + 88 + YES - - - - + + + + - + - 15 - - + 89 + + - 16 - - + 90 + + - 17 - - + 91 + + - 18 - - + 107 + + + YES + + + + - 19 - - + 108 + + + YES + + + - 20 - - + 109 + + - 21 - - + 110 + + + YES + + + - 22 - - + 111 + + - 23 - - + 123 + + + YES + + + + Context Menu - 24 - - + 124 + + - 25 - - + 16 + + + + + 129 + + @@ -692,21 +1483,27 @@ YES -3.IBPluginDependency - 10.IBAttributePlaceholdersKey - 10.IBPluginDependency - 10.ImportedFromIB2 + 107.IBPluginDependency + 108.IBAttributePlaceholdersKey + 108.IBPluginDependency + 109.IBPluginDependency 11.IBAttributePlaceholdersKey 11.IBPluginDependency 11.ImportedFromIB2 + 110.IBAttributePlaceholdersKey + 110.IBPluginDependency + 111.IBPluginDependency 12.IBAttributePlaceholdersKey 12.IBPluginDependency 12.ImportedFromIB2 + 123.IBEditorWindowLastContentRect + 123.IBPluginDependency + 124.IBPluginDependency + 129.IBPluginDependency 13.IBPluginDependency 14.IBEditorWindowLastContentRect 14.IBPluginDependency 14.ImportedFromIB2 - 15.IBPluginDependency - 15.ImportedFromIB2 16.IBPluginDependency 16.ImportedFromIB2 17.IBPluginDependency @@ -714,12 +1511,8 @@ 18.IBPluginDependency 18.ImportedFromIB2 19.IBPluginDependency - 20.IBPluginDependency - 21.IBPluginDependency - 22.IBPluginDependency 23.IBPluginDependency 24.IBPluginDependency - 25.IBPluginDependency 3.IBEditorWindowLastContentRect 3.IBPluginDependency 3.IBWindowTemplateEditedContentRect @@ -730,30 +1523,60 @@ 3.windowTemplate.minSize 4.IBPluginDependency 4.ImportedFromIB2 - 5.IBPluginDependency - 5.ImportedFromIB2 + 52.IBPluginDependency + 53.IBPluginDependency + 54.IBPluginDependency + 55.IBPluginDependency + 56.IBPluginDependency + 57.IBPluginDependency + 58.IBPluginDependency + 59.IBPluginDependency 6.IBPluginDependency 6.ImportedFromIB2 + 61.IBPluginDependency + 62.IBEditorWindowLastContentRect + 62.IBPluginDependency + 63.IBAttributePlaceholdersKey + 63.IBPluginDependency + 64.IBAttributePlaceholdersKey + 64.IBPluginDependency + 65.IBPluginDependency + 66.IBPluginDependency + 67.IBPluginDependency + 68.IBPluginDependency + 69.IBPluginDependency 7.IBPluginDependency 7.ImportedFromIB2 - 8.IBPluginDependency - 8.ImportedFromIB2 - 9.IBPluginDependency - 9.ImportedFromIB2 + 80.IBPluginDependency + 80.ImportedFromIB2 + 81.IBPluginDependency + 81.ImportedFromIB2 + 82.IBPluginDependency + 83.IBPluginDependency + 86.IBPluginDependency + 87.IBPluginDependency + 88.IBEditorWindowLastContentRect + 88.IBPluginDependency + 89.IBPluginDependency + 90.IBPluginDependency + 91.IBPluginDependency + 92.IBPluginDependency + 93.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit ToolTip ToolTip - - Choose the column(s) to be indexed (enter multiple columns comma separated) + + Add indexed field - com.apple.InterfaceBuilder.CocoaPlugin - + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit ToolTip @@ -764,6 +1587,16 @@ com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Remove indexed field + + + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit ToolTip @@ -774,45 +1607,86 @@ com.apple.InterfaceBuilder.CocoaPlugin + {{663, 479}, {142, 23}} com.apple.InterfaceBuilder.CocoaPlugin - {{736, 413}, {131, 71}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - + {{631, 783}, {167, 54}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{695, 411}, {267, 274}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{644, 219}, {267, 139}} - com.apple.InterfaceBuilder.CocoaPlugin - {{644, 219}, {267, 139}} + {{695, 411}, {267, 274}} {3.40282e+38, 3.40282e+38} - {213, 107} + {267, 274} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{63, 565}, {360, 157}} + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Advanced index settings + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Advanced index settings + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{772, 286}, {168, 64}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -831,7 +1705,7 @@ - 51 + 131 @@ -1983,9 +2857,12 @@ YES addIndex: + addIndexedField: chooseIndexType: closeSheet: removeIndex: + removeIndexedField: + toggleAdvancedIndexOptionsView: YES @@ -1993,6 +2870,9 @@ id id id + id + id + id @@ -2000,9 +2880,12 @@ YES addIndex: + addIndexedField: chooseIndexType: closeSheet: removeIndex: + removeIndexedField: + toggleAdvancedIndexOptionsView: YES @@ -2010,6 +2893,10 @@ addIndex: id + + addIndexedField: + id + chooseIndexType: id @@ -2022,6 +2909,14 @@ removeIndex: id + + removeIndexedField: + id + + + toggleAdvancedIndexOptionsView: + id + @@ -2029,12 +2924,24 @@ YES addIndexButton + addIndexedColumnButton + anchoredButtonBar + confirmAddIndexButton dbDocument + indexAdvancedOptionsView + indexAdvancedOptionsViewButton + indexAdvancedOptionsViewLabelButton + indexNameLabel indexNameTextField + indexSizeTableColumn + indexStorageTypePopUpButton + indexTypeLabel indexTypePopUpButton - indexedColumnsComboBox + indexedColumnsScrollView + indexedColumnsTableView indexesTableView removeIndexButton + removeIndexedColumnButton tableData tableStructure tablesList @@ -2042,12 +2949,24 @@ YES NSButton + NSButton + BWAnchoredButtonBar + NSButton SPDatabaseDocument + NSView + NSButton + NSButton + NSTextField + NSTextField + NSTableColumn + NSPopUpButton NSTextField NSPopUpButton - NSComboBox + NSScrollView + NSTableView NSTableView NSButton + NSButton SPTableData SPTableStructure SPTablesList @@ -2058,12 +2977,24 @@ YES addIndexButton + addIndexedColumnButton + anchoredButtonBar + confirmAddIndexButton dbDocument + indexAdvancedOptionsView + indexAdvancedOptionsViewButton + indexAdvancedOptionsViewLabelButton + indexNameLabel indexNameTextField + indexSizeTableColumn + indexStorageTypePopUpButton + indexTypeLabel indexTypePopUpButton - indexedColumnsComboBox + indexedColumnsScrollView + indexedColumnsTableView indexesTableView removeIndexButton + removeIndexedColumnButton tableData tableStructure tablesList @@ -2074,21 +3005,65 @@ addIndexButton NSButton + + addIndexedColumnButton + NSButton + + + anchoredButtonBar + BWAnchoredButtonBar + + + confirmAddIndexButton + NSButton + dbDocument SPDatabaseDocument + + indexAdvancedOptionsView + NSView + + + indexAdvancedOptionsViewButton + NSButton + + + indexAdvancedOptionsViewLabelButton + NSButton + + + indexNameLabel + NSTextField + indexNameTextField NSTextField + + indexSizeTableColumn + NSTableColumn + + + indexStorageTypePopUpButton + NSPopUpButton + + + indexTypeLabel + NSTextField + indexTypePopUpButton NSPopUpButton - indexedColumnsComboBox - NSComboBox + indexedColumnsScrollView + NSScrollView + + + indexedColumnsTableView + NSTableView indexesTableView @@ -2098,6 +3073,10 @@ removeIndexButton NSButton + + removeIndexedColumnButton + NSButton + tableData SPTableData @@ -2171,6 +3150,7 @@ reloadTable: removeField: resetAutoIncrement: + showOptimizedFieldType: unhideIndexesView: @@ -2183,6 +3163,7 @@ id id id + id @@ -2196,6 +3177,7 @@ reloadTable: removeField: resetAutoIncrement: + showOptimizedFieldType: unhideIndexesView: @@ -2228,6 +3210,10 @@ resetAutoIncrement: id + + showOptimizedFieldType: + id + unhideIndexesView: id @@ -2242,7 +3228,9 @@ addIndexButton chooseKeyButton copyFieldButton + databaseDataInstance editTableButton + encodingPopupCell extendedTableInfoInstance indexesController indexesShowButton @@ -2272,6 +3260,8 @@ id id id + id + id NSButton id id @@ -2299,7 +3289,9 @@ addIndexButton chooseKeyButton copyFieldButton + databaseDataInstance editTableButton + encodingPopupCell extendedTableInfoInstance indexesController indexesShowButton @@ -2338,10 +3330,18 @@ copyFieldButton id + + databaseDataInstance + id + editTableButton id + + encodingPopupCell + id + extendedTableInfoInstance id @@ -2840,6 +3840,30 @@ YES + + BWAnchoredButton + NSButton + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredButton.h + + + + BWAnchoredButtonBar + NSView + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredButtonBar.h + + + + BWAnchoredButtonCell + NSButtonCell + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredButtonCell.h + + NSActionCell NSCell @@ -2930,14 +3954,6 @@ AppKit.framework/Headers/NSCell.h - - NSComboBox - NSTextField - - IBFrameworkSource - AppKit.framework/Headers/NSComboBox.h - - NSComboBoxCell NSTextFieldCell @@ -3244,6 +4260,13 @@ Print.framework/Headers/PDEPluginInterface.h + + NSObject + + IBFrameworkSource + PrintCore.framework/Headers/PDEPluginInterface.h + + NSObject @@ -3359,6 +4382,22 @@ AppKit.framework/Headers/NSResponder.h + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + NSSearchField NSTextField @@ -3399,6 +4438,22 @@ AppKit.framework/Headers/NSTabView.h + + NSTableColumn + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableColumn.h + + + + NSTableHeaderView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTableHeaderView.h + + NSTableView NSControl @@ -3533,13 +4588,19 @@ YES YES + NSAddTemplate NSMenuCheckmark NSMenuMixedState + NSRemoveTemplate + NSSwitch YES + {8, 8} {9, 8} {7, 2} + {8, 8} + {15, 15} -- cgit v1.2.3