diff options
| -rw-r--r-- | Interfaces/English.lproj/ContentPaginationView.xib | 301 | ||||
| -rw-r--r-- | Source/SPTableContent.h | 1 | ||||
| -rw-r--r-- | Source/SPTableContent.m | 19 |
3 files changed, 161 insertions, 160 deletions
diff --git a/Interfaces/English.lproj/ContentPaginationView.xib b/Interfaces/English.lproj/ContentPaginationView.xib index 882e6157..3e12e6fc 100644 --- a/Interfaces/English.lproj/ContentPaginationView.xib +++ b/Interfaces/English.lproj/ContentPaginationView.xib @@ -2,9 +2,9 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">11E53</string> + <string key="IBDocument.SystemVersion">11G63b</string> <string key="IBDocument.InterfaceBuilderVersion">851</string> - <string key="IBDocument.AppKitVersion">1138.47</string> + <string key="IBDocument.AppKitVersion">1138.51</string> <string key="IBDocument.HIToolboxVersion">569.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -692,6 +692,14 @@ </object> <int key="connectionID">57</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">paginationGoButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="247243534"/> + </object> + <int key="connectionID">58</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1045,7 +1053,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">57</int> + <int key="maxID">58</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1096,13 +1104,6 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPConnectionController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPContentFilterManager.h</string> </object> </object> @@ -1142,24 +1143,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">toggleCollapse:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <string key="NS.key.0">toggleCollapse:</string> - <object class="IBActionInfo" key="NS.object.0"> - <string key="name">toggleCollapse:</string> - <string key="candidateClassName">id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="260415642"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPTablesList.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSTextView</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1402,7 +1385,6 @@ <string>showCompletionList:</string> <string>showHelpForCurrentWord:</string> <string>showHelpForSearchString:</string> - <string>toggleQueryInfoPaneCollapse:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1428,7 +1410,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>NSButton</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -1457,7 +1438,6 @@ <string>showCompletionList:</string> <string>showHelpForCurrentWord:</string> <string>showHelpForSearchString:</string> - <string>toggleQueryInfoPaneCollapse:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1549,10 +1529,6 @@ <string key="name">showHelpForSearchString:</string> <string key="candidateClassName">id</string> </object> - <object class="IBActionInfo"> - <string key="name">toggleQueryInfoPaneCollapse:</string> - <string key="candidateClassName">NSButton</string> - </object> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -1581,9 +1557,9 @@ <string>helpTargetSelector</string> <string>helpWebView</string> <string>helpWebViewWindow</string> - <string>multipleLineEditingButton</string> <string>nextHistoryMenuItem</string> <string>previousHistoryMenuItem</string> + <string>queryEditorSplitView</string> <string>queryFavoriteNameTextField</string> <string>queryFavoritesButton</string> <string>queryFavoritesSaveAllMenuItem</string> @@ -1637,9 +1613,9 @@ <string>NSSegmentedControl</string> <string>WebView</string> <string>NSWindow</string> - <string>id</string> <string>NSMenuItem</string> <string>NSMenuItem</string> + <string>SPSplitView</string> <string>NSTextField</string> <string>id</string> <string>NSMenuItem</string> @@ -1653,7 +1629,7 @@ <string>id</string> <string>NSMenuItem</string> <string>NSButton</string> - <string>NSSplitView</string> + <string>SPSplitView</string> <string>id</string> <string>NSMenuItem</string> <string>id</string> @@ -1696,9 +1672,9 @@ <string>helpTargetSelector</string> <string>helpWebView</string> <string>helpWebViewWindow</string> - <string>multipleLineEditingButton</string> <string>nextHistoryMenuItem</string> <string>previousHistoryMenuItem</string> + <string>queryEditorSplitView</string> <string>queryFavoriteNameTextField</string> <string>queryFavoritesButton</string> <string>queryFavoritesSaveAllMenuItem</string> @@ -1819,10 +1795,6 @@ <string key="candidateClassName">NSWindow</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">multipleLineEditingButton</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">nextHistoryMenuItem</string> <string key="candidateClassName">NSMenuItem</string> </object> @@ -1831,6 +1803,10 @@ <string key="candidateClassName">NSMenuItem</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">queryEditorSplitView</string> + <string key="candidateClassName">SPSplitView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">queryFavoriteNameTextField</string> <string key="candidateClassName">NSTextField</string> </object> @@ -1884,7 +1860,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">queryInfoPaneSplitView</string> - <string key="candidateClassName">NSSplitView</string> + <string key="candidateClassName">SPSplitView</string> </object> <object class="IBToOneOutletInfo"> <string key="name">runAllButton</string> @@ -1992,7 +1968,6 @@ <string>flushPrivileges:</string> <string>flushTable:</string> <string>focusOnTableContentFilter:</string> - <string>focusOnTableListFilter:</string> <string>import:</string> <string>importFromClipboard:</string> <string>openCurrentConnectionInNewWindow:</string> @@ -2061,7 +2036,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -2089,7 +2063,6 @@ <string>flushPrivileges:</string> <string>flushTable:</string> <string>focusOnTableContentFilter:</string> - <string>focusOnTableListFilter:</string> <string>import:</string> <string>importFromClipboard:</string> <string>openCurrentConnectionInNewWindow:</string> @@ -2200,10 +2173,6 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">focusOnTableListFilter:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> <string key="name">import:</string> <string key="candidateClassName">id</string> </object> @@ -2342,7 +2311,6 @@ <string>saveConnectionIncludeQuery</string> <string>saveConnectionSavePassword</string> <string>saveConnectionSavePasswordAlert</string> - <string>sidebarGrabber</string> <string>spHistoryControllerInstance</string> <string>statusTableAccessoryView</string> <string>statusTableCopyChecksum</string> @@ -2350,10 +2318,8 @@ <string>tableContentInstance</string> <string>tableDataInstance</string> <string>tableDumpInstance</string> - <string>tableInfoCollapseButton</string> <string>tableInfoScrollView</string> <string>tableInfoTable</string> - <string>tableListSplitter</string> <string>tableRelationsInstance</string> <string>tableSourceInstance</string> <string>tableTabView</string> @@ -2373,7 +2339,7 @@ <string>id</string> <string>id</string> <string>NSWindow</string> - <string>NSSplitView</string> + <string>SPSplitView</string> <string>id</string> <string>NSButton</string> <string>id</string> @@ -2419,14 +2385,11 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> <string>SPTableContent</string> <string>SPTableData</string> <string>id</string> - <string>NSButton</string> <string>NSScrollView</string> <string>NSTableView</string> - <string>NSSplitView</string> <string>id</string> <string>SPTableStructure</string> <string>NSTabView</string> @@ -2491,7 +2454,6 @@ <string>saveConnectionIncludeQuery</string> <string>saveConnectionSavePassword</string> <string>saveConnectionSavePasswordAlert</string> - <string>sidebarGrabber</string> <string>spHistoryControllerInstance</string> <string>statusTableAccessoryView</string> <string>statusTableCopyChecksum</string> @@ -2499,10 +2461,8 @@ <string>tableContentInstance</string> <string>tableDataInstance</string> <string>tableDumpInstance</string> - <string>tableInfoCollapseButton</string> <string>tableInfoScrollView</string> <string>tableInfoTable</string> - <string>tableListSplitter</string> <string>tableRelationsInstance</string> <string>tableSourceInstance</string> <string>tableTabView</string> @@ -2533,7 +2493,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">contentViewSplitter</string> - <string key="candidateClassName">NSSplitView</string> + <string key="candidateClassName">SPSplitView</string> </object> <object class="IBToOneOutletInfo"> <string key="name">copyDatabaseButton</string> @@ -2700,10 +2660,6 @@ <string key="candidateClassName">id</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">sidebarGrabber</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">spHistoryControllerInstance</string> <string key="candidateClassName">id</string> </object> @@ -2732,10 +2688,6 @@ <string key="candidateClassName">id</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">tableInfoCollapseButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">tableInfoScrollView</string> <string key="candidateClassName">NSScrollView</string> </object> @@ -2744,10 +2696,6 @@ <string key="candidateClassName">NSTableView</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">tableListSplitter</string> - <string key="candidateClassName">NSSplitView</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">tableRelationsInstance</string> <string key="candidateClassName">id</string> </object> @@ -3112,7 +3060,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>NSButton</string> <string>NSButton</string> - <string>BWAnchoredButtonBar</string> + <string>NSBox</string> <string>NSButton</string> <string>SPDatabaseDocument</string> <string>NSView</string> @@ -3175,7 +3123,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">anchoredButtonBar</string> - <string key="candidateClassName">BWAnchoredButtonBar</string> + <string key="candidateClassName">NSBox</string> </object> <object class="IBToOneOutletInfo"> <string key="name">confirmAddIndexButton</string> @@ -3265,6 +3213,57 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">SPSplitView</string> + <string key="superclassName">NSSplitView</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">toggleCollapse:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">toggleCollapse:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">toggleCollapse:</string> + <string key="candidateClassName">id</string> + </object> + </object> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>additionalDragHandleView</string> + <string>collapseToggleButton</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSView</string> + <string>NSButton</string> + </object> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>additionalDragHandleView</string> + <string>collapseToggleButton</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">additionalDragHandleView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">collapseToggleButton</string> + <string key="candidateClassName">NSButton</string> + </object> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPSplitView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">SPTableContent</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> @@ -3282,7 +3281,6 @@ <string>setDefaultOperator:</string> <string>showDefaultOperaterHelp:</string> <string>showFilterTable:</string> - <string>swapFilterTable:</string> <string>tableFilterClear:</string> <string>toggleDistinctSelect:</string> <string>toggleFilterField:</string> @@ -3308,7 +3306,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> <string>NSButton</string> </object> </object> @@ -3327,7 +3324,6 @@ <string>setDefaultOperator:</string> <string>showDefaultOperaterHelp:</string> <string>showFilterTable:</string> - <string>swapFilterTable:</string> <string>tableFilterClear:</string> <string>toggleDistinctSelect:</string> <string>toggleFilterField:</string> @@ -3382,10 +3378,6 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">swapFilterTable:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> <string key="name">tableFilterClear:</string> <string key="candidateClassName">id</string> </object> @@ -3425,13 +3417,15 @@ <string>fieldField</string> <string>filterButton</string> <string>filterTableClearButton</string> - <string>filterTableDistinctMenuItem</string> + <string>filterTableDistinctCheckbox</string> <string>filterTableFilterButton</string> - <string>filterTableGearLookAllFields</string> <string>filterTableLiveSearchCheckbox</string> <string>filterTableNegateCheckbox</string> + <string>filterTableQueryTitle</string> + <string>filterTableSearchAllFields</string> <string>filterTableSetDefaultOperatorSheet</string> <string>filterTableSetDefaultOperatorValue</string> + <string>filterTableSplitView</string> <string>filterTableView</string> <string>filterTableWhereClause</string> <string>filterTableWindow</string> @@ -3441,6 +3435,7 @@ <string>limitRowsStepper</string> <string>multipleLineEditingButton</string> <string>paginationButton</string> + <string>paginationGoButton</string> <string>paginationNextButton</string> <string>paginationPageField</string> <string>paginationPageStepper</string> @@ -3469,13 +3464,15 @@ <string>NSPopUpButton</string> <string>id</string> <string>NSButton</string> - <string>NSMenuItem</string> <string>NSButton</string> - <string>NSMenuItem</string> <string>NSButton</string> <string>NSButton</string> + <string>NSButton</string> + <string>NSTextField</string> + <string>NSButton</string> <string>NSPanel</string> <string>NSComboBox</string> + <string>SPSplitView</string> <string>SPCopyTable</string> <string>SPTextView</string> <string>NSPanel</string> @@ -3486,6 +3483,7 @@ <string>NSButton</string> <string>NSButton</string> <string>NSButton</string> + <string>NSButton</string> <string>NSTextField</string> <string>NSStepper</string> <string>NSButton</string> @@ -3516,13 +3514,15 @@ <string>fieldField</string> <string>filterButton</string> <string>filterTableClearButton</string> - <string>filterTableDistinctMenuItem</string> + <string>filterTableDistinctCheckbox</string> <string>filterTableFilterButton</string> - <string>filterTableGearLookAllFields</string> <string>filterTableLiveSearchCheckbox</string> <string>filterTableNegateCheckbox</string> + <string>filterTableQueryTitle</string> + <string>filterTableSearchAllFields</string> <string>filterTableSetDefaultOperatorSheet</string> <string>filterTableSetDefaultOperatorValue</string> + <string>filterTableSplitView</string> <string>filterTableView</string> <string>filterTableWhereClause</string> <string>filterTableWindow</string> @@ -3532,6 +3532,7 @@ <string>limitRowsStepper</string> <string>multipleLineEditingButton</string> <string>paginationButton</string> + <string>paginationGoButton</string> <string>paginationNextButton</string> <string>paginationPageField</string> <string>paginationPageStepper</string> @@ -3591,18 +3592,14 @@ <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">filterTableDistinctMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> + <string key="name">filterTableDistinctCheckbox</string> + <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> <string key="name">filterTableFilterButton</string> <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">filterTableGearLookAllFields</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">filterTableLiveSearchCheckbox</string> <string key="candidateClassName">NSButton</string> </object> @@ -3611,6 +3608,14 @@ <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">filterTableQueryTitle</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">filterTableSearchAllFields</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">filterTableSetDefaultOperatorSheet</string> <string key="candidateClassName">NSPanel</string> </object> @@ -3619,6 +3624,10 @@ <string key="candidateClassName">NSComboBox</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">filterTableSplitView</string> + <string key="candidateClassName">SPSplitView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">filterTableView</string> <string key="candidateClassName">SPCopyTable</string> </object> @@ -3655,6 +3664,10 @@ <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">paginationGoButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">paginationNextButton</string> <string key="candidateClassName">NSButton</string> </object> @@ -3737,6 +3750,13 @@ </object> <object class="IBPartialClassDescription"> <string key="className">SPTableContent</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPTableContentFilter.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">SPTableContent</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="outlets"> <string key="NS.key.0">tableWindow</string> @@ -3802,7 +3822,6 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>activitiesTable</string> - <string>containerView</string> <string>infoTable</string> <string>tableDataInstance</string> <string>tableDocumentInstance</string> @@ -3813,7 +3832,6 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSTableView</string> - <string>NSView</string> <string>id</string> <string>id</string> <string>id</string> @@ -3827,7 +3845,6 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>activitiesTable</string> - <string>containerView</string> <string>infoTable</string> <string>tableDataInstance</string> <string>tableDocumentInstance</string> @@ -3842,10 +3859,6 @@ <string key="candidateClassName">NSTableView</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">containerView</string> - <string key="candidateClassName">NSView</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">infoTable</string> <string key="candidateClassName">id</string> </object> @@ -3886,7 +3899,6 @@ <string>addField:</string> <string>closeSheet:</string> <string>duplicateField:</string> - <string>reloadTable:</string> <string>removeField:</string> <string>resetAutoIncrement:</string> <string>showOptimizedFieldType:</string> @@ -3901,7 +3913,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> <string>NSMenuItem</string> <string>id</string> </object> @@ -3913,7 +3924,6 @@ <string>addField:</string> <string>closeSheet:</string> <string>duplicateField:</string> - <string>reloadTable:</string> <string>removeField:</string> <string>resetAutoIncrement:</string> <string>showOptimizedFieldType:</string> @@ -3935,10 +3945,6 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">reloadTable:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> <string key="name">removeField:</string> <string key="candidateClassName">id</string> </object> @@ -4180,6 +4186,24 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">SPTableStructure</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">reloadTable:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">reloadTable:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">reloadTable:</string> + <string key="candidateClassName">id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPTableStructureLoading.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">SPTableView</string> <string key="superclassName">NSTableView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -4316,7 +4340,6 @@ <string>tableDocumentInstance</string> <string>tableDumpInstance</string> <string>tableEncodingButton</string> - <string>tableInfoCollapseButton</string> <string>tableInfoInstance</string> <string>tableListFilterSplitView</string> <string>tableListSplitView</string> @@ -4369,10 +4392,9 @@ <string>SPDatabaseDocument</string> <string>id</string> <string>id</string> - <string>NSButton</string> <string>id</string> - <string>NSSplitView</string> - <string>NSSplitView</string> + <string>SPSplitView</string> + <string>SPSplitView</string> <string>id</string> <string>id</string> <string>SPTableStructure</string> @@ -4425,7 +4447,6 @@ <string>tableDocumentInstance</string> <string>tableDumpInstance</string> <string>tableEncodingButton</string> - <string>tableInfoCollapseButton</string> <string>tableInfoInstance</string> <string>tableListFilterSplitView</string> <string>tableListSplitView</string> @@ -4581,20 +4602,16 @@ <string key="candidateClassName">id</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">tableInfoCollapseButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">tableInfoInstance</string> <string key="candidateClassName">id</string> </object> <object class="IBToOneOutletInfo"> <string key="name">tableListFilterSplitView</string> - <string key="candidateClassName">NSSplitView</string> + <string key="candidateClassName">SPSplitView</string> </object> <object class="IBToOneOutletInfo"> <string key="name">tableListSplitView</string> - <string key="candidateClassName">NSSplitView</string> + <string key="candidateClassName">SPSplitView</string> </object> <object class="IBToOneOutletInfo"> <string key="name">tableNameField</string> @@ -4646,7 +4663,10 @@ </object> </object> </object> - <reference key="sourceIdentifier" ref="260415642"/> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPTablesList.h</string> + </object> </object> <object class="IBPartialClassDescription"> <string key="className">SPTextView</string> @@ -4844,7 +4864,7 @@ <string>removeSchemaPrivButton</string> <string>schemaController</string> <string>schemasTableView</string> - <string>splitViewButtonBar</string> + <string>splitView</string> <string>tabView</string> <string>treeController</string> <string>userNameTextField</string> @@ -4866,7 +4886,7 @@ <string>NSButton</string> <string>NSArrayController</string> <string>NSTableView</string> - <string>BWAnchoredButtonBar</string> + <string>SPSplitView</string> <string>NSTabView</string> <string>NSTreeController</string> <string>NSTextField</string> @@ -4891,7 +4911,7 @@ <string>removeSchemaPrivButton</string> <string>schemaController</string> <string>schemasTableView</string> - <string>splitViewButtonBar</string> + <string>splitView</string> <string>tabView</string> <string>treeController</string> <string>userNameTextField</string> @@ -4959,8 +4979,8 @@ <string key="candidateClassName">NSTableView</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">splitViewButtonBar</string> - <string key="candidateClassName">BWAnchoredButtonBar</string> + <string key="name">splitView</string> + <string key="candidateClassName">SPSplitView</string> </object> <object class="IBToOneOutletInfo"> <string key="name">tabView</string> @@ -4992,14 +5012,6 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">BWAnchoredButtonBar</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredButtonBar.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSActionCell</string> <string key="superclassName">NSCell</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -5051,13 +5063,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSArrayController</string> <string key="superclassName">NSObjectController</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -5773,13 +5778,6 @@ <reference key="sourceIdentifier" ref="431977310"/> </object> <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">BWToolkitFramework.framework/Headers/NSView+BWAdditions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -5802,13 +5800,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSWindowController</string> <string key="superclassName">NSResponder</string> <object class="NSMutableDictionary" key="actions"> diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index 1eb6b678..66aab772 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -89,6 +89,7 @@ IBOutlet NSButton *paginationPreviousButton; #ifndef SP_REFACTOR IBOutlet NSButton *paginationButton; + IBOutlet NSButton *paginationGoButton; #endif IBOutlet NSButton *paginationNextButton; #ifndef SP_REFACTOR diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 9d598ae1..dceea288 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -1488,6 +1488,7 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper */ - (IBAction)filterTable:(id)sender { + BOOL senderIsPaginationButton = (sender == paginationPreviousButton || sender == paginationNextButton || sender == paginationGoButton); // Record whether the filter is being triggered by using delete/backspace in the filter field, which // can trigger the effect of clicking the "clear filter" button in the field. @@ -1496,15 +1497,23 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper #ifndef SP_REFACTOR - if(sender == filterTableFilterButton) + // If the filter table is being used - the advanced filter - switch type + if(sender == filterTableFilterButton) { activeFilter = 1; - else if([sender isKindOfClass:[NSString class]] && [(NSString *)sender length]) { + } + + // If a string was supplied, use a custom query from that URL scheme + else if ([sender isKindOfClass:[NSString class]] && [(NSString *)sender length]) { if(schemeFilter) [schemeFilter release], schemeFilter = nil; schemeFilter = [sender retain]; activeFilter = 2; } - else + + // If a button other than the pagination buttons was used, set the active filter type to + // the standard filter field. + else if (!senderIsPaginationButton) { activeFilter = 0; + } #endif NSString *taskString; @@ -1529,7 +1538,7 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper // Select the correct pagination value. // If the filter button was used, or if pagination is disabled, reset to page one - if ([sender isKindOfClass:[NSButton class]] || [sender isKindOfClass:[NSTextField class]] || ![prefs boolForKey:SPLimitResults] || [paginationPageField integerValue] <= 0) + if (!senderIsPaginationButton && ([sender isKindOfClass:[NSButton class]] || [sender isKindOfClass:[NSTextField class]] || ![prefs boolForKey:SPLimitResults] || [paginationPageField integerValue] <= 0)) contentPage = 1; // If the current page is out of bounds, move it within bounds @@ -1738,7 +1747,7 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper [paginationPageField setIntegerValue:(contentPage + 1)]; } - [self filterTable:self]; + [self filterTable:sender]; } /** |