From 977d1a25340e5c2aef868f43cb180a1d9472b29c Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sun, 5 Apr 2009 00:38:34 +0000 Subject: - Fix an invalid reference to a missing pulldown_arrow image causing invalid log entries - Set the focus to the custom query text field when appropriate when switching to the custom query tab - Add the ability to set the custom query editor font, save and load it from preferences, and no longer reset the font on queries --- Interfaces/English.lproj/DBView.xib | 177 +++++++++++++++--------------------- 1 file changed, 73 insertions(+), 104 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 589b22a2..63520b84 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -8,7 +8,6 @@ 353.00 YES - YES @@ -45,7 +44,7 @@ {3.40282e+38, 3.40282e+38} {780, 480} - + 256 YES @@ -79,7 +78,6 @@ 4352 {194, 393} - YES @@ -176,7 +174,6 @@ {{1, 1}, {194, 393}} - @@ -192,7 +189,6 @@ -2147483392 {{175, 1}, {15, 481}} - _doScroller: 9.979253e-01 @@ -202,7 +198,6 @@ 256 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -211,7 +206,6 @@ {196, 395} - 530 @@ -234,7 +228,6 @@ 4352 {194, 123} - YES @@ -298,7 +291,6 @@ {{1, 1}, {194, 123}} - @@ -309,7 +301,6 @@ -2147483392 {{175, 1}, {15, 481}} - _doScroller: 9.979253e-01 @@ -319,7 +310,6 @@ 256 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -328,7 +318,6 @@ {{0, 404}, {196, 125}} - 530 @@ -339,14 +328,12 @@ {{-1, 22}, {196, 529}} - 292 {{0, -1}, {32, 25}} - YES -2080244224 @@ -375,7 +362,6 @@ 292 {{20, 0}, {46, 25}} - YES -2076049856 @@ -399,7 +385,10 @@ 1048576 2147483647 - + + NSImage + button_action + _popUpItemAction: @@ -473,7 +462,6 @@ {{179, 0}, {15, 23}} - YES 130560 @@ -506,7 +494,6 @@ {{93, 0}, {86, 23}} - YES 130560 @@ -527,7 +514,6 @@ 292 {{61, -1}, {32, 25}} - YES -2080244224 @@ -550,7 +536,6 @@ {194, 550} - NSView @@ -563,13 +548,12 @@ 274 {{-7, -10}, {672, 564}} - YES source - + 256 YES @@ -1924,6 +1908,7 @@ {{10, 7}, {637, 544}} + Structure @@ -2543,7 +2528,7 @@ customQuery - + 256 YES @@ -2570,32 +2555,8 @@ 6418 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 - 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 - - {625, 14} - @@ -2654,7 +2615,6 @@ {{1, 1}, {625, 155}} - @@ -2669,7 +2629,6 @@ -2147483392 {{598, 1}, {15, 68}} - _doScroller: 1.000000e+00 @@ -2679,7 +2638,6 @@ 256 {{-100, -100}, {601, 11}} - 257 _doScroller: @@ -2689,7 +2647,6 @@ {627, 157} - 530 @@ -2699,7 +2656,6 @@ {627, 156} - NSView @@ -2722,14 +2678,12 @@ 4352 {625, 228} - YES 256 {625, 17} - @@ -2737,7 +2691,6 @@ -2147483392 {{-26, 0}, {16, 17}} - YES @@ -2781,7 +2734,6 @@ {{1, 17}, {625, 228}} - @@ -2792,7 +2744,6 @@ -2147483392 {{611, 17}, {15, 30}} - _doScroller: 9.375000e-01 @@ -2802,7 +2753,6 @@ -2147483392 {{1, 47}, {610, 15}} - 1 _doScroller: @@ -2817,7 +2767,6 @@ {{1, 0}, {625, 17}} - @@ -2827,7 +2776,6 @@ {627, 246} - 562 @@ -2842,7 +2790,6 @@ 268 {{156, 246}, {98, 22}} - YES -2076049856 @@ -2853,7 +2800,7 @@ 45 NSImage - pulldown_arrow + appicon @@ -2893,7 +2840,6 @@ 264 {{38, 246}, {108, 22}} - YES -2076049856 @@ -2976,7 +2922,6 @@ 268 {{-10, 245}, {46, 25}} - YES -2076049856 @@ -2985,10 +2930,7 @@ -2042609409 35 - - NSImage - button_action - + 400 @@ -3000,7 +2942,7 @@ 1048576 2147483647 - + _popUpItemAction: @@ -3143,6 +3085,16 @@ _popUpItemAction: + + + Editor Font... + + 2147483647 + + + _popUpItemAction: + + Indent New Lines @@ -3179,7 +3131,7 @@ - 12 + 13 YES 1 YES @@ -3191,7 +3143,6 @@ 265 {{528, 248}, {90, 17}} - YES -2080244224 @@ -3213,7 +3164,6 @@ 265 {{410, 248}, {110, 17}} - YES 604110336 @@ -3246,7 +3196,6 @@ {{32, 246}, {595, 23}} - YES 130560 @@ -3262,7 +3211,6 @@ {{0, 165}, {627, 269}} - NSView @@ -3273,9 +3221,8 @@ 266 - {{242, 67}, {368, 14}} + {{242, 64}, {368, 17}} - YES 67239424 @@ -3292,7 +3239,6 @@ 264 {{17, 67}, {143, 14}} - YES 67239424 @@ -3313,7 +3259,6 @@ 274 {{17, 20}, {593, 43}} - YES 67239424 @@ -3328,18 +3273,14 @@ {{0, 443}, {627, 87}} - NSView {{6, 10}, {627, 530}} - {{10, 7}, {637, 544}} - - Custom Query @@ -3712,33 +3653,29 @@ - + 134217731 YES YES YES - + {{203, 0}, {660, 550}} - NSView {863, 550} - YES DBViewSplitter {863, 550} - - {{0, 0}, {1440, 878}} {780, 502} @@ -4176,7 +4113,6 @@ {{1, 17}, {213, 157}} - 4 @@ -4209,7 +4145,6 @@ {{1, 0}, {213, 17}} - 4 @@ -4218,7 +4153,6 @@ {{12, 34}, {215, 175}} - 562 @@ -7397,7 +7331,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {292, 112} {269, 112} - + 256 YES @@ -7819,7 +7753,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {269, 112} - {{0, 0}, {1680, 1028}} {269, 134} @@ -12530,6 +12463,30 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5368 + + + gearMenuItemSelected: + + + + 5371 + + + + editorFontMenuItem + + + + 5372 + + + + customQueryTextView + + + + 5373 + @@ -17378,6 +17335,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + @@ -17754,6 +17712,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 5369 + + + @@ -18866,6 +18829,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5359.ImportedFromIB2 5360.IBPluginDependency 5361.IBPluginDependency + 5369.IBPluginDependency 557.IBPluginDependency 557.ImportedFromIB2 565.IBEditorWindowLastContentRect @@ -19265,7 +19229,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin - {{502, 555}, {188, 64}} + {{324, 555}, {188, 64}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -19284,7 +19248,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin - {{620, 599}, {137, 20}} + {{442, 599}, {137, 20}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -19744,8 +19708,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{481, 388}, {519, 335}} - {{481, 388}, {519, 335}} + {{429, 388}, {519, 335}} + {{429, 388}, {519, 335}} {{136, 447}, {519, 335}} @@ -20172,7 +20136,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{375, 258}, {175, 73}} + {{94, 194}, {175, 73}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -20194,8 +20158,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{263, 242}, {863, 550}} - {{263, 242}, {863, 550}} + {{26, 267}, {863, 550}} + {{26, 267}, {863, 550}} {{62, 352}, {845, 504}} @@ -20377,7 +20341,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{283, 448}, {236, 237}} + {{217, 392}, {236, 254}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -20396,8 +20360,8 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{809, 307}, {269, 112}} - {{809, 307}, {269, 112}} + {{679, 307}, {269, 112}} + {{679, 307}, {269, 112}} @@ -20477,6 +20441,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{456, 426}, {292, 112}} {{456, 426}, {292, 112}} @@ -20747,7 +20712,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 5368 + 5373 @@ -20852,6 +20817,7 @@ Y2hhbmdlIHRoZSBvcmRlcg completionListMenuItem copyQueryFavoriteButton customQueryView + editorFontMenuItem errorText queryFavoritesButton queryFavoritesSheet @@ -20878,6 +20844,7 @@ Y2hhbmdlIHRoZSBvcmRlcg NSMenuItem id CMCopyTable + NSMenuItem id id id @@ -21207,6 +21174,7 @@ Y2hhbmdlIHRoZSBvcmRlcg connectSheet createTableSyntaxWindow customQueryInstance + customQueryTextView databaseEncodingButton databaseField databaseNameField @@ -21245,6 +21213,7 @@ Y2hhbmdlIHRoZSBvcmRlcg id NSWindow id + CMTextView id id id -- cgit v1.2.3