From 63f30386aa21d2bb74233698c0b8a3d72333858d Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Tue, 15 Jun 2010 23:22:10 +0000 Subject: Add a new button bar to the query editor in preparation for redesigning the errors/message panel (show/hide button current inactive and disabled). Rows affected and timing stats are now displayed in the button bar. Also, fix the height of all other button bars. --- Interfaces/English.lproj/ConnectionView.xib | 11 +- Interfaces/English.lproj/DBView.xib | 390 ++++++++++++++++------------ 2 files changed, 228 insertions(+), 173 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index 04ce1163..34a56f74 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -21,7 +21,7 @@ YES - + @@ -77,7 +77,7 @@ 4352 - {202, 541} + {202, 538} YES @@ -171,7 +171,7 @@ 1 - {202, 541} + {202, 538} @@ -201,7 +201,7 @@ 0.99590158462524414 - {{0, 22}, {202, 541}} + {{0, 24}, {202, 538}} 560 @@ -360,7 +360,6 @@ - 1 YES 1 YES @@ -369,7 +368,7 @@ - {202, 23} + {{0, 1}, {202, 23}} YES YES diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index c97930dc..e0a87052 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,6 +23,7 @@ YES + YES @@ -51,7 +52,7 @@ NSApplication - + 274 YES @@ -271,6 +272,7 @@ {{1, 1}, {218, 38}} + 6 @@ -302,6 +304,7 @@ {{-1, -13}, {220, 40}} + 2 @@ -399,6 +402,7 @@ {214, 354} + 4 @@ -426,6 +430,7 @@ {214, 354} + 528 @@ -561,6 +566,7 @@ {214, 145} + 6 @@ -588,6 +594,7 @@ {214, 145} + 512 @@ -896,11 +903,11 @@ -926662401 163 - + NSImage button_pane_show_icon - + NSImage button_pane_hide_icon @@ -911,7 +918,7 @@ - {214, 23} + {{0, 1}, {214, 23}} YES YES @@ -938,7 +945,7 @@ source - + 256 YES @@ -1456,6 +1463,7 @@ {{1, 17}, {694, 289}} + 4 @@ -1488,6 +1496,7 @@ {{1, 0}, {694, 17}} + 4 @@ -1496,6 +1505,7 @@ {{-1, 22}, {696, 307}} + 562 @@ -1772,7 +1782,7 @@ 4352 - {694, 142} + {694, 140} YES @@ -2040,8 +2050,9 @@ 0 - {{1, 17}, {694, 142}} + {{1, 17}, {694, 140}} + 4 @@ -2053,7 +2064,7 @@ _doScroller: - 0.89361697435379028 + 0.97794115543365479 @@ -2074,14 +2085,16 @@ {{1, 0}, {694, 17}} + 4 - {{-1, 22}, {696, 160}} + {{-1, 23}, {696, 158}} + 562 @@ -2093,7 +2106,7 @@ 292 - {{-1, -1}, {32, 25}} + {{-1, 0}, {32, 25}} YES @@ -2114,7 +2127,7 @@ 292 - {{61, -1}, {32, 25}} + {{61, 0}, {32, 25}} YES @@ -2135,7 +2148,7 @@ 292 - {{30, -1}, {32, 25}} + {{30, 0}, {32, 25}} YES @@ -2168,7 +2181,7 @@ NeXT TIFF v4.0 pasteboard type - {{93, 0}, {602, 23}} + {{93, 1}, {602, 23}} YES @@ -2194,7 +2207,6 @@ {{10, 7}, {706, 544}} - Structure @@ -2220,7 +2232,7 @@ 4352 - {694, 455} + {694, 450} YES @@ -2280,7 +2292,7 @@ 0 - {{1, 17}, {694, 455}} + {{1, 17}, {694, 450}} @@ -2294,7 +2306,7 @@ _doScroller: - 0.9669603705406189 + 0.99557524919509888 @@ -2304,7 +2316,7 @@ 1 _doScroller: - 0.0014534880174323916 + 0.021626397967338562 0.99840247631072998 @@ -2323,7 +2335,7 @@ - {{6, 32}, {696, 473}} + {{6, 33}, {696, 468}} 562 @@ -2370,7 +2382,7 @@ 292 - {{6, 9}, {32, 25}} + {{6, 10}, {32, 25}} YES @@ -2391,7 +2403,7 @@ 292 - {{100, 9}, {32, 25}} + {{100, 10}, {32, 25}} YES @@ -2412,7 +2424,7 @@ 292 - {{37, 9}, {32, 25}} + {{37, 10}, {32, 25}} YES @@ -2433,7 +2445,7 @@ 292 - {{68, 9}, {32, 25}} + {{68, 10}, {32, 25}} YES @@ -2466,7 +2478,7 @@ NeXT TIFF v4.0 pasteboard type - {{163, 10}, {539, 23}} + {{163, 11}, {539, 23}} YES @@ -2483,7 +2495,7 @@ 292 - {{131, 9}, {32, 25}} + {{131, 10}, {32, 25}} YES @@ -2511,7 +2523,7 @@ 290 - {{166, 6}, {421, 22}} + {{166, 7}, {421, 22}} YES @@ -2872,7 +2884,7 @@ 289 - {{654, 9}, {32, 25}} + {{654, 10}, {32, 25}} YES @@ -2896,7 +2908,7 @@ 289 - {{592, 9}, {32, 25}} + {{592, 10}, {32, 25}} YES @@ -2920,7 +2932,7 @@ 289 - {{623, 9}, {32, 25}} + {{623, 10}, {32, 25}} YES @@ -2951,7 +2963,7 @@ customQuery - + 256 YES @@ -2978,7 +2990,30 @@ 6418 - {694, 14} + + YES + + YES + Apple HTML pasteboard type + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + Apple URL pasteboard type + CorePasteboardFlavorType 0x6D6F6F76 + NSColor pasteboard type + NSFilenamesPboardType + NSStringPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT RTFD pasteboard type + NeXT Rich Text Format v1.0 pasteboard type + NeXT TIFF v4.0 pasteboard type + NeXT font pasteboard type + NeXT ruler pasteboard type + WebURLsWithTitlesPboardType + public.url + + + {{0, -1}, {694, 14}} @@ -3037,7 +3072,7 @@ - {{1, 1}, {694, 155}} + {{1, 1}, {694, 147}} @@ -3069,7 +3104,7 @@ 0.94565218687057495 - {696, 157} + {696, 149} 530 @@ -3078,7 +3113,7 @@ - {696, 156} + {696, 149} NSView @@ -3100,7 +3135,7 @@ 4352 - {694, 228} + {694, 215} YES @@ -3159,7 +3194,7 @@ 0 - {{1, 17}, {694, 228}} + {{1, 17}, {694, 215}} @@ -3202,7 +3237,7 @@ - {696, 246} + {696, 233} 562 @@ -3216,7 +3251,7 @@ 268 - {{156, 246}, {98, 22}} + {{156, 233}, {98, 22}} YES @@ -3329,7 +3364,7 @@ 264 - {{38, 246}, {108, 22}} + {{38, 233}, {108, 22}} YES @@ -3443,7 +3478,7 @@ 268 - {{-10, 245}, {48, 25}} + {{-10, 232}, {48, 25}} YES @@ -3783,7 +3818,7 @@ 265 - {{597, 248}, {90, 17}} + {{597, 235}, {90, 17}} YES @@ -3804,7 +3839,7 @@ 265 - {{479, 248}, {110, 17}} + {{479, 235}, {110, 17}} YES @@ -3836,7 +3871,7 @@ NeXT TIFF v4.0 pasteboard type - {{32, 246}, {664, 23}} + {{32, 233}, {664, 23}} YES @@ -3851,7 +3886,7 @@ YES - {{0, 165}, {696, 269}} + {{0, 158}, {696, 256}} NSView @@ -3860,26 +3895,10 @@ 256 YES - - - 266 - {{242, 64}, {437, 17}} - - YES - - 67239424 - 71303168 - - - - - - - 264 - {{17, 67}, {143, 14}} + {{17, 65}, {143, 14}} YES @@ -3895,7 +3914,7 @@ 274 - {{17, 20}, {662, 43}} + {{17, 20}, {662, 41}} YES @@ -3909,16 +3928,68 @@ - {{0, 443}, {696, 87}} + {{0, 423}, {696, 85}} NSView - {{6, 10}, {696, 530}} + {{6, 33}, {696, 508}} + + + 290 + + YES + + + 268 + {{0, -1}, {32, 24}} + + YES + + -1543373312 + 134348800 + + + + -926662401 + 163 + + + + + 200 + 25 + + + + + 266 + {{37, 1}, {642, 17}} + + YES + + 67239424 + 4194304 + + + + + + + + + {{6, 11}, {696, 23}} + + NO + YES + NO + 1 + {{10, 7}, {706, 544}} + Custom Query @@ -4755,7 +4826,7 @@ 4352 - {694, 454} + {694, 456} YES @@ -4954,7 +5025,7 @@ 0 - {{1, 17}, {694, 454}} + {{1, 17}, {694, 456}} @@ -4996,7 +5067,7 @@ - {{6, 32}, {696, 472}} + {{6, 33}, {696, 474}} 562 @@ -5010,7 +5081,7 @@ 292 - {{6, 9}, {32, 25}} + {{6, 10}, {32, 25}} YES @@ -5031,7 +5102,7 @@ 292 - {{68, 9}, {32, 25}} + {{68, 10}, {32, 25}} YES @@ -5052,7 +5123,7 @@ 292 - {{37, 9}, {32, 25}} + {{37, 10}, {32, 25}} YES @@ -5085,7 +5156,7 @@ NeXT TIFF v4.0 pasteboard type - {{100, 10}, {602, 23}} + {{100, 11}, {602, 23}} YES @@ -5437,7 +5508,7 @@ - {{6, 32}, {696, 472}} + {{6, 33}, {696, 472}} 562 @@ -5451,7 +5522,7 @@ 292 - {{6, 9}, {32, 25}} + {{6, 10}, {32, 25}} YES @@ -5472,7 +5543,7 @@ 292 - {{68, 9}, {32, 25}} + {{68, 10}, {32, 25}} YES @@ -5493,7 +5564,7 @@ 292 - {{37, 9}, {32, 25}} + {{37, 10}, {32, 25}} YES @@ -5526,7 +5597,7 @@ NeXT TIFF v4.0 pasteboard type - {{100, 10}, {602, 23}} + {{100, 11}, {602, 23}} YES @@ -5564,14 +5635,14 @@ - + 134217731 YES YES YES - + @@ -5588,6 +5659,7 @@ {943, 549} + NSView @@ -11762,14 +11834,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 262 - - - affectedRowsText - - - - 299 - tableDumpInstance @@ -16067,6 +16131,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7096 + + + affectedRowsText + + + + 7205 + @@ -19993,12 +20065,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - + @@ -20965,6 +21037,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES + @@ -20984,7 +21057,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - @@ -21462,15 +21534,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - 298 - - - YES - - - - 224 @@ -21499,11 +21562,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - 3784 - - - 1246 @@ -22505,6 +22563,44 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 SPIndexesController + + 7168 + + + YES + + + + + + + 7172 + + + YES + + + + + + 7173 + + + + + 7203 + + + YES + + + + + + 7204 + + + @@ -22760,8 +22856,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 296.ImportedFromIB2 297.IBPluginDependency 297.ImportedFromIB2 - 298.IBPluginDependency - 298.ImportedFromIB2 35.IBPluginDependency 35.ImportedFromIB2 36.CustomClassName @@ -22776,7 +22870,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 3781.IBPluginDependency 3782.IBPluginDependency 3783.IBPluginDependency - 3784.IBPluginDependency 38.IBPluginDependency 38.ImportedFromIB2 3826.IBPluginDependency @@ -23819,6 +23912,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 715.ImportedFromIB2 716.IBPluginDependency 716.ImportedFromIB2 + 7168.IBPluginDependency + 7172.IBAttributePlaceholdersKey + 7172.IBPluginDependency + 7173.IBPluginDependency + 7203.IBPluginDependency + 7203.ImportedFromIB2 + 7204.IBPluginDependency 748.IBPluginDependency 748.ImportedFromIB2 749.IBPluginDependency @@ -24283,8 +24383,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - CMCopyTable com.apple.InterfaceBuilder.CocoaPlugin @@ -24298,7 +24396,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25685,7 +25782,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{925, -119}, {943, 549}} + {{102, 142}, {943, 549}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{1013, 364}, {157, 63}} @@ -25718,6 +25815,20 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit + + ToolTip + + ToolTip + + Toggle the visibility of the Information panel + + + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25844,7 +25955,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 7096 + 7205 @@ -26857,6 +26968,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 indexTypePopUpButton indexedColumnsComboBox indexesTableView + removeIndexButton tableData tableStructure tablesList @@ -26869,6 +26981,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSPopUpButton NSComboBox NSTableView + NSButton SPTableData SPTableStructure SPTablesList @@ -27618,63 +27731,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - YES - - SPIndexesController - NSWindowController - - YES - - YES - addIndex: - chooseIndexType: - closeSheet: - removeIndex: - - - YES - id - id - id - id - - - - YES - - YES - addIndexButton - dbDocument - indexNameTextField - indexTypePopUpButton - indexedColumnsComboBox - indexesTableView - removeIndexButton - tableData - tableStructure - tablesList - - - YES - NSButton - SPDatabaseDocument - NSTextField - NSPopUpButton - NSComboBox - NSTableView - NSButton - SPTableData - SPTableStructure - SPTablesList - - - - IBDocumentRelativeSource - ../../Source/SPIndexesController.h - - - YES -- cgit v1.2.3