From 75ef02696f362f408efece70ede90a6575abfb5a Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sun, 8 May 2011 16:13:11 +0000 Subject: - Fix a number of warnings for DBView.xib by moving some 10.6-only code from a #ifndef SP_REFACTOR/#else/#endif to just a #ifdef SP_REFACTOR//#endif, and remarking a few items as IBOutlets - Update localisable strings --- Interfaces/English.lproj/DBView.xib | 864 ++++++++++++++++++++++++++++++++++-- 1 file changed, 823 insertions(+), 41 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 46fe64ef..50a93a3f 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,15 +23,12 @@ YES - - - YES com.brandonwalkin.BWToolkit - com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.WebKitIBPlugin PluginDependencyRecalculationVersion @@ -49,7 +46,7 @@ NSApplication - + 274 YES @@ -522,7 +519,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -567,7 +564,6 @@ {{1, 1}, {218, 38}} - 6 @@ -599,7 +595,6 @@ {{-1, -13}, {220, 40}} - 2 @@ -697,7 +692,6 @@ {214, 352} - 4 @@ -725,7 +719,6 @@ {214, 352} - 528 @@ -861,7 +854,6 @@ {216, 145} - 6 @@ -888,7 +880,6 @@ {{-1, 0}, {216, 145}} - 528 @@ -976,7 +967,6 @@ {214, 145} - 6 @@ -1004,7 +994,6 @@ {214, 145} - 512 @@ -2637,7 +2626,6 @@ {{1, 17}, {694, 454}} - 2 @@ -2671,7 +2659,6 @@ {{1, 0}, {694, 17}} - 4 @@ -2680,7 +2667,6 @@ {{6, 33}, {696, 472}} - 562 @@ -6490,7 +6476,6 @@ {943, 549} - NSView @@ -7213,7 +7198,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -7358,7 +7343,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 7 @@ -7368,7 +7353,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Reset Auto Increment NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {255, 95} @@ -7531,7 +7516,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {255, 117} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -7541,7 +7526,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Relation NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 @@ -8142,7 +8127,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {302, 307} {{0, 0}, {1440, 878}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -8152,7 +8137,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Trigger NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {360, 348} @@ -8559,7 +8544,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {360, 370} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 3 @@ -8571,7 +8556,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 50} @@ -8691,7 +8676,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1920, 1178}} {213, 72} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -8703,7 +8688,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -8838,7 +8823,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 15 @@ -8850,7 +8835,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {350, 200} @@ -9073,7 +9058,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {350, 222} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPCreateSyntaxSheet @@ -9086,7 +9071,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -9256,7 +9241,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 31 @@ -9266,7 +9251,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 MySQL Help NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {351, 120} @@ -9664,7 +9649,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {351, 136} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} MYSQL_HELP_WINDOW @@ -9675,7 +9660,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Filter NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {380, 170} @@ -10317,7 +10302,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 778}} {380, 192} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPTableFilterPanel @@ -10817,7 +10802,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA Secure Text Input Sheet NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 @@ -10921,7 +10906,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA {338, 150} {{0, 0}, {1280, 778}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -11104,7 +11089,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA disabledControlTextColor 3 - MC4zMzMzMzMzNDMzAA + MC4zMzMzMzMzMzMzAA @@ -26958,6 +26943,395 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + YES + + YES + affectedRowsText + autohelpMenuItem + autoindentMenuItem + autopairMenuItem + autouppercaseKeywordsMenuItem + clearHistoryMenuItem + commentCurrentQueryMenuItem + commentLineOrSelectionMenuItem + completionListMenuItem + copyHistoryMenuItem + customQueryScrollView + customQueryView + editorFontMenuItem + encodingPopUp + errorText + errorTextScrollView + helpNavigator + helpSearchField + helpSearchFieldCell + helpTargetSelector + helpWebView + helpWebViewWindow + multipleLineEditingButton + nextHistoryMenuItem + previousHistoryMenuItem + queryFavoriteNameTextField + queryFavoritesButton + queryFavoritesSaveAllMenuItem + queryFavoritesSaveAsMenuItem + queryFavoritesSearchField + queryFavoritesSearchFieldView + queryFavoritesSearchMenuItem + queryFavoritesSheet + queryHistoryButton + queryHistorySearchField + queryHistorySearchFieldView + queryHistorySearchMenuItem + queryInfoButton + queryInfoPaneSplitView + runAllButton + runAllMenuItem + runSelectionButton + runSelectionMenuItem + saveHistoryMenuItem + saveQueryFavoriteButton + saveQueryFavoriteGlobal + shiftLeftMenuItem + shiftRightMenuItem + tableDocumentInstance + tablesListInstance + textView + valueSheet + valueTextField + + + YES + id + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSScrollView + SPCopyTable + NSMenuItem + NSPopUpButton + id + NSScrollView + NSSegmentedControl + NSSearchField + NSSearchFieldCell + NSSegmentedControl + WebView + NSWindow + id + NSMenuItem + NSMenuItem + NSTextField + id + NSMenuItem + NSMenuItem + NSSearchField + id + NSMenuItem + NSWindow + id + NSSearchField + id + NSMenuItem + NSButton + NSSplitView + id + NSMenuItem + id + NSMenuItem + NSMenuItem + NSButton + NSButton + NSMenuItem + NSMenuItem + id + id + SPTextView + id + id + + + + YES + + YES + affectedRowsText + autohelpMenuItem + autoindentMenuItem + autopairMenuItem + autouppercaseKeywordsMenuItem + clearHistoryMenuItem + commentCurrentQueryMenuItem + commentLineOrSelectionMenuItem + completionListMenuItem + copyHistoryMenuItem + customQueryScrollView + customQueryView + editorFontMenuItem + encodingPopUp + errorText + errorTextScrollView + helpNavigator + helpSearchField + helpSearchFieldCell + helpTargetSelector + helpWebView + helpWebViewWindow + multipleLineEditingButton + nextHistoryMenuItem + previousHistoryMenuItem + queryFavoriteNameTextField + queryFavoritesButton + queryFavoritesSaveAllMenuItem + queryFavoritesSaveAsMenuItem + queryFavoritesSearchField + queryFavoritesSearchFieldView + queryFavoritesSearchMenuItem + queryFavoritesSheet + queryHistoryButton + queryHistorySearchField + queryHistorySearchFieldView + queryHistorySearchMenuItem + queryInfoButton + queryInfoPaneSplitView + runAllButton + runAllMenuItem + runSelectionButton + runSelectionMenuItem + saveHistoryMenuItem + saveQueryFavoriteButton + saveQueryFavoriteGlobal + shiftLeftMenuItem + shiftRightMenuItem + tableDocumentInstance + tablesListInstance + textView + valueSheet + valueTextField + + + YES + + affectedRowsText + id + + + autohelpMenuItem + NSMenuItem + + + autoindentMenuItem + NSMenuItem + + + autopairMenuItem + NSMenuItem + + + autouppercaseKeywordsMenuItem + NSMenuItem + + + clearHistoryMenuItem + NSMenuItem + + + commentCurrentQueryMenuItem + NSMenuItem + + + commentLineOrSelectionMenuItem + NSMenuItem + + + completionListMenuItem + NSMenuItem + + + copyHistoryMenuItem + NSMenuItem + + + customQueryScrollView + NSScrollView + + + customQueryView + SPCopyTable + + + editorFontMenuItem + NSMenuItem + + + encodingPopUp + NSPopUpButton + + + errorText + id + + + errorTextScrollView + NSScrollView + + + helpNavigator + NSSegmentedControl + + + helpSearchField + NSSearchField + + + helpSearchFieldCell + NSSearchFieldCell + + + helpTargetSelector + NSSegmentedControl + + + helpWebView + WebView + + + helpWebViewWindow + NSWindow + + + multipleLineEditingButton + id + + + nextHistoryMenuItem + NSMenuItem + + + previousHistoryMenuItem + NSMenuItem + + + queryFavoriteNameTextField + NSTextField + + + queryFavoritesButton + id + + + queryFavoritesSaveAllMenuItem + NSMenuItem + + + queryFavoritesSaveAsMenuItem + NSMenuItem + + + queryFavoritesSearchField + NSSearchField + + + queryFavoritesSearchFieldView + id + + + queryFavoritesSearchMenuItem + NSMenuItem + + + queryFavoritesSheet + NSWindow + + + queryHistoryButton + id + + + queryHistorySearchField + NSSearchField + + + queryHistorySearchFieldView + id + + + queryHistorySearchMenuItem + NSMenuItem + + + queryInfoButton + NSButton + + + queryInfoPaneSplitView + NSSplitView + + + runAllButton + id + + + runAllMenuItem + NSMenuItem + + + runSelectionButton + id + + + runSelectionMenuItem + NSMenuItem + + + saveHistoryMenuItem + NSMenuItem + + + saveQueryFavoriteButton + NSButton + + + saveQueryFavoriteGlobal + NSButton + + + shiftLeftMenuItem + NSMenuItem + + + shiftRightMenuItem + NSMenuItem + + + tableDocumentInstance + id + + + tablesListInstance + id + + + textView + SPTextView + + + valueSheet + id + + + valueTextField + id + + + IBProjectSource Source/SPCustomQuery.h @@ -27695,14 +28069,18 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA statusTableCopyChecksum statusTableView statusValues + tableContentInstance + tableDataInstance tableDumpInstance tableInfoCollapseButton tableInfoScrollView tableInfoTable tableListSplitter tableRelationsInstance + tableSourceInstance tableTabView tableTriggersInstance + tablesListInstance taskCancelButton taskCancellationCallbackObject taskDescriptionText @@ -27765,14 +28143,18 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id + SPTableContent + SPTableData id NSButton NSScrollView NSTableView NSSplitView id + SPTableStructure NSTabView id + SPTablesList NSButton id id @@ -27838,14 +28220,18 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA statusTableCopyChecksum statusTableView statusValues + tableContentInstance + tableDataInstance tableDumpInstance tableInfoCollapseButton tableInfoScrollView tableInfoTable tableListSplitter tableRelationsInstance + tableSourceInstance tableTabView tableTriggersInstance + tablesListInstance taskCancelButton taskCancellationCallbackObject taskDescriptionText @@ -28061,6 +28447,14 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA statusValues id + + tableContentInstance + SPTableContent + + + tableDataInstance + SPTableData + tableDumpInstance id @@ -28085,6 +28479,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableRelationsInstance id + + tableSourceInstance + SPTableStructure + tableTabView NSTabView @@ -28093,6 +28491,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableTriggersInstance id + + tablesListInstance + SPTablesList + taskCancelButton NSButton @@ -29385,6 +29787,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA saveServerProcesses: setAutoRefreshInterval: setCustomAutoRefreshInterval: + toggeleShowFullProcessList: toggleProcessListAutoRefresh: toggleShowProcessID: @@ -29400,6 +29803,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id + id @@ -29414,6 +29818,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA saveServerProcesses: setAutoRefreshInterval: setCustomAutoRefreshInterval: + toggeleShowFullProcessList: toggleProcessListAutoRefresh: toggleShowProcessID: @@ -29451,6 +29856,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA setCustomAutoRefreshInterval: id + + toggeleShowFullProcessList: + id + toggleProcessListAutoRefresh: id @@ -29964,6 +30373,318 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + YES + + YES + addButton + argumentField + betweenTextField + compareField + contentFilterManager + contentViewPane + copyButton + countText + fieldField + filterButton + filterTableClearButton + filterTableDistinctMenuItem + filterTableFilterButton + filterTableGearLookAllFields + filterTableLiveSearchCheckbox + filterTableNegateCheckbox + filterTableSetDefaultOperatorSheet + filterTableSetDefaultOperatorValue + filterTableView + filterTableWhereClause + filterTableWindow + firstBetweenField + limitRowsButton + limitRowsField + limitRowsStepper + multipleLineEditingButton + paginationButton + paginationNextButton + paginationPageField + paginationPageStepper + paginationPreviousButton + paginationView + reloadButton + removeButton + secondBetweenField + spHistoryControllerInstance + tableContentView + tableDataInstance + tableDocumentInstance + tableInfoInstance + tableSourceInstance + tablesListInstance + + + YES + id + id + id + id + id + NSView + id + id + NSPopUpButton + id + NSButton + NSMenuItem + NSButton + NSMenuItem + NSButton + NSButton + NSPanel + NSComboBox + SPCopyTable + SPTextView + NSPanel + id + id + id + id + id + NSButton + NSButton + NSTextField + NSStepper + NSButton + NSView + id + id + id + SPHistoryController + SPCopyTable + SPTableData + SPDatabaseDocument + SPTableInfo + id + id + + + + YES + + YES + addButton + argumentField + betweenTextField + compareField + contentFilterManager + contentViewPane + copyButton + countText + fieldField + filterButton + filterTableClearButton + filterTableDistinctMenuItem + filterTableFilterButton + filterTableGearLookAllFields + filterTableLiveSearchCheckbox + filterTableNegateCheckbox + filterTableSetDefaultOperatorSheet + filterTableSetDefaultOperatorValue + filterTableView + filterTableWhereClause + filterTableWindow + firstBetweenField + limitRowsButton + limitRowsField + limitRowsStepper + multipleLineEditingButton + paginationButton + paginationNextButton + paginationPageField + paginationPageStepper + paginationPreviousButton + paginationView + reloadButton + removeButton + secondBetweenField + spHistoryControllerInstance + tableContentView + tableDataInstance + tableDocumentInstance + tableInfoInstance + tableSourceInstance + tablesListInstance + + + YES + + addButton + id + + + argumentField + id + + + betweenTextField + id + + + compareField + id + + + contentFilterManager + id + + + contentViewPane + NSView + + + copyButton + id + + + countText + id + + + fieldField + NSPopUpButton + + + filterButton + id + + + filterTableClearButton + NSButton + + + filterTableDistinctMenuItem + NSMenuItem + + + filterTableFilterButton + NSButton + + + filterTableGearLookAllFields + NSMenuItem + + + filterTableLiveSearchCheckbox + NSButton + + + filterTableNegateCheckbox + NSButton + + + filterTableSetDefaultOperatorSheet + NSPanel + + + filterTableSetDefaultOperatorValue + NSComboBox + + + filterTableView + SPCopyTable + + + filterTableWhereClause + SPTextView + + + filterTableWindow + NSPanel + + + firstBetweenField + id + + + limitRowsButton + id + + + limitRowsField + id + + + limitRowsStepper + id + + + multipleLineEditingButton + id + + + paginationButton + NSButton + + + paginationNextButton + NSButton + + + paginationPageField + NSTextField + + + paginationPageStepper + NSStepper + + + paginationPreviousButton + NSButton + + + paginationView + NSView + + + reloadButton + id + + + removeButton + id + + + secondBetweenField + id + + + spHistoryControllerInstance + SPHistoryController + + + tableContentView + SPCopyTable + + + tableDataInstance + SPTableData + + + tableDocumentInstance + SPDatabaseDocument + + + tableInfoInstance + SPTableInfo + + + tableSourceInstance + id + + + tablesListInstance + id + + + IBProjectSource Source/SPTableContent.h @@ -30952,6 +31673,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA spHistoryControllerInstance tableContentInstance tableDataInstance + tableDocumentInstance tableDumpInstance tableEncodingButton tableInfoCollapseButton @@ -31001,6 +31723,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA SPHistoryController id id + SPDatabaseDocument id id NSButton @@ -31053,6 +31776,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA spHistoryControllerInstance tableContentInstance tableDataInstance + tableDocumentInstance tableDumpInstance tableEncodingButton tableInfoCollapseButton @@ -31189,6 +31913,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableDataInstance id + + tableDocumentInstance + SPDatabaseDocument + tableDumpInstance id @@ -31283,6 +32011,52 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id + + YES + + YES + customQueryInstance + scrollView + tableDocumentInstance + tablesListInstance + + + YES + SPCustomQuery + NSScrollView + SPDatabaseDocument + SPTablesList + + + + YES + + YES + customQueryInstance + scrollView + tableDocumentInstance + tablesListInstance + + + YES + + customQueryInstance + SPCustomQuery + + + scrollView + NSScrollView + + + tableDocumentInstance + SPDatabaseDocument + + + tablesListInstance + SPTablesList + + + IBProjectSource Source/SPTextView.h @@ -32132,6 +32906,14 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA AppKit.framework/Headers/NSSplitView.h + + NSStepper + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSStepper.h + + NSTabView NSView -- cgit v1.2.3