From 99ec873ef3e78512b70285f4b83334df9463c0a1 Mon Sep 17 00:00:00 2001 From: avenjamin Date: Wed, 24 Jun 2009 13:18:30 +0000 Subject: - Modified titlebar display of SSH status --- Interfaces/English.lproj/DBView.xib | 1319 ++++++++++++++++++----------------- Source/CMMCPConnection.m | 28 +- Source/TableDocument.h | 4 + Source/TableDocument.m | 21 +- 4 files changed, 722 insertions(+), 650 deletions(-) diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 966ee2c3..35e3f50f 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -8,7 +8,8 @@ 353.00 YES - + + YES @@ -400,26 +401,26 @@ 2 NO - + 290 YES - - + + 268 {{-1, -1}, {32, 24}} - + YES - + 67239424 134348800 - + -2033958657 163 - + NSImage NSAddTemplate @@ -429,25 +430,25 @@ 25 - - + + 268 {{30, -1}, {32, 24}} - + YES - + 71433792 134350848 - + -2038284033 163 400 75 - - + + YES @@ -458,74 +459,74 @@ NSImage NSActionTemplate - + NSImage NSMenuCheckmark - + NSImage NSMenuMixedState _popUpItemAction: - + YES - + OtherViews YES - - - + + + Rename Table... 2147483647 - - + + _popUpItemAction: - + - - + + Duplicate Table... 2147483647 - - + + _popUpItemAction: - + - - + + YES YES 2147483647 - - + + _popUpItemAction: - + - - + + Truncate Table 2147483647 - - + + _popUpItemAction: - + - - + + Remove Table 2147483647 - - + + _popUpItemAction: - + @@ -535,18 +536,18 @@ YES - - + + 268 {{61, -1}, {32, 24}} - + YES - + 67239424 134348800 - + -2033958657 163 @@ -559,18 +560,18 @@ 25 - - + + 268 {{92, -1}, {32, 24}} - + YES - + -2080244224 134348800 - + -926662401 163 @@ -615,7 +616,7 @@ source - + 256 YES @@ -1258,7 +1259,7 @@ -2042347265 402653219 - + NSImage button_add @@ -1282,7 +1283,7 @@ -2041822977 268435491 - + NSImage button_refresh @@ -1361,7 +1362,7 @@ 130560 33554432 - + NSImage button_bar_spacer @@ -1843,7 +1844,7 @@ -2042347265 35 - + 400 @@ -1864,7 +1865,7 @@ -2041822977 268435491 - + r 400 @@ -1913,7 +1914,7 @@ 130560 33554432 - + 0 1 0 @@ -1933,6 +1934,7 @@ {{10, 7}, {700, 544}} + Structure @@ -2100,8 +2102,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2147,8 +2149,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2403,7 +2405,7 @@ -2042347265 402653219 - + a 400 @@ -2424,7 +2426,7 @@ -2041822977 268435491 - + r 400 @@ -2494,7 +2496,7 @@ 130560 33554432 - + 0 1 0 @@ -2907,8 +2909,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -2918,8 +2920,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -2931,8 +2933,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -2958,7 +2960,7 @@ -2042609409 35 - + NSImage button_action @@ -2973,7 +2975,7 @@ 1048576 2147483647 - + _popUpItemAction: @@ -2989,8 +2991,8 @@ r 1048576 2147483647 - - + + _popUpItemAction: 1 @@ -3002,8 +3004,8 @@ r 1572864 2147483647 - - + + _popUpItemAction: 2 @@ -3015,8 +3017,8 @@ 2147483647 - - + + _popUpItemAction: @@ -3027,8 +3029,8 @@ 75yAA 262144 2147483647 - - + + _popUpItemAction: 3 @@ -3040,8 +3042,8 @@ 75yBA 262144 2147483647 - - + + _popUpItemAction: 4 @@ -3051,8 +3053,8 @@ Clear History 2147483647 - - + + _popUpItemAction: 5 @@ -3064,8 +3066,8 @@ 2147483647 - - + + _popUpItemAction: @@ -3075,8 +3077,8 @@ ] 1048576 2147483647 - - + + _popUpItemAction: 6 @@ -3087,8 +3089,8 @@ [ 1048576 2147483647 - - + + _popUpItemAction: 7 @@ -3098,8 +3100,8 @@ Completion List Gw 2147483647 - - + + _popUpItemAction: 8 @@ -3111,8 +3113,8 @@ 2147483647 - - + + _popUpItemAction: @@ -3121,8 +3123,8 @@ Editor Font... 2147483647 - - + + _popUpItemAction: @@ -3132,8 +3134,8 @@ 2147483647 1 - - + + _popUpItemAction: 9 @@ -3144,8 +3146,8 @@ 2147483647 1 - - + + _popUpItemAction: 10 @@ -3155,8 +3157,8 @@ Auto-uppercase Keywords 2147483647 - - + + _popUpItemAction: @@ -3165,8 +3167,8 @@ Update Help while typing 2147483647 - - + + _popUpItemAction: @@ -3242,7 +3244,7 @@ 130560 33554432 - + 0 1 0 @@ -3327,7 +3329,7 @@ status - + 256 YES @@ -3354,29 +3356,6 @@ 2322 - - 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 - - {536, 14} @@ -3990,7 +3969,6 @@ {{10, 7}, {700, 544}} - Status @@ -4306,7 +4284,7 @@ -2042347265 35 - + 400 @@ -4327,7 +4305,7 @@ -2041822977 268435491 - + r 400 @@ -4376,7 +4354,7 @@ 130560 33554432 - + 0 1 0 @@ -4408,14 +4386,14 @@ - + 134217731 YES YES YES - + @@ -4948,6 +4926,7 @@ {{0, 17}, {215, 287}} + 2 @@ -4980,6 +4959,7 @@ {215, 17} + 4 @@ -4988,6 +4968,7 @@ {{-1, 23}, {215, 304}} + 528 @@ -5038,7 +5019,7 @@ 130560 33554432 - + 0 1 0 @@ -5427,8 +5408,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5446,8 +5427,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5457,8 +5438,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5468,8 +5449,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5481,8 +5462,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5492,8 +5473,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5503,8 +5484,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5514,8 +5495,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5527,8 +5508,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5538,8 +5519,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5549,8 +5530,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5562,8 +5543,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5573,8 +5554,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5584,8 +5565,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5595,8 +5576,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5606,8 +5587,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5619,8 +5600,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5630,8 +5611,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5643,8 +5624,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5654,8 +5635,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5667,8 +5648,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5678,8 +5659,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5689,8 +5670,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5700,8 +5681,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5710,8 +5691,8 @@ EUC-KR Korean (euckr) 2147483647 - - + + _popUpItemAction: @@ -5846,8 +5827,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5865,8 +5846,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5876,8 +5857,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5887,8 +5868,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5900,8 +5881,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5911,8 +5892,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5922,8 +5903,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5933,8 +5914,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5946,8 +5927,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5957,8 +5938,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5968,8 +5949,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5981,8 +5962,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -5992,8 +5973,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6003,8 +5984,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6014,8 +5995,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6025,8 +6006,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6038,8 +6019,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6049,8 +6030,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6062,8 +6043,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6073,8 +6054,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6086,8 +6067,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6097,8 +6078,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6108,8 +6089,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6119,8 +6100,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6129,8 +6110,8 @@ EUC-KR Korean (euckr) 2147483647 - - + + _popUpItemAction: @@ -6488,8 +6469,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -6507,8 +6488,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6518,8 +6499,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6529,8 +6510,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6791,8 +6772,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -6810,8 +6791,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -6821,8 +6802,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -6832,8 +6813,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -6908,7 +6889,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {3.40282e+38, 3.40282e+38} - + 256 YES @@ -6927,7 +6908,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{80, 10}, {171, 22}} - YES -2076049856 @@ -6947,8 +6927,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -6964,8 +6944,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -6975,8 +6955,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -6993,7 +6973,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{29, 15}, {49, 14}} - YES 68288064 @@ -7008,12 +6987,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {266, 40}} - {{17, 231}, {268, 56}} - {0, 0} 67239424 @@ -7047,7 +7024,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{81, 40}, {170, 22}} - YES -2076049856 @@ -7067,8 +7043,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -7084,8 +7060,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7095,8 +7071,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7105,8 +7081,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Cascade 2147483647 - - + + _popUpItemAction: @@ -7115,8 +7091,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Delete 2147483647 - - + + _popUpItemAction: @@ -7133,7 +7109,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{81, 10}, {170, 22}} - YES -2076049856 @@ -7153,8 +7128,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -7170,8 +7145,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7181,8 +7156,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7191,8 +7166,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Cascade 2147483647 - - + + _popUpItemAction: @@ -7201,8 +7176,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Delete 2147483647 - - + + _popUpItemAction: @@ -7219,7 +7194,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{15, 45}, {64, 14}} - YES 68288064 @@ -7236,7 +7210,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{19, 15}, {59, 14}} - YES 68288064 @@ -7251,12 +7224,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {266, 71}} - {{17, 49}, {268, 87}} - {0, 0} 67239424 @@ -7290,7 +7261,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{80, 40}, {171, 22}} - YES -2076049856 @@ -7310,8 +7280,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -7327,8 +7297,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7338,8 +7308,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7356,7 +7326,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{80, 10}, {171, 22}} - YES -2076049856 @@ -7376,8 +7345,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -7393,8 +7362,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7404,8 +7373,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7422,7 +7391,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{123, 87}, {299, 26}} - YES -2076049856 @@ -7442,8 +7410,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -7459,8 +7427,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7470,8 +7438,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7488,7 +7456,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{41, 45}, {37, 14}} - YES 68288064 @@ -7505,7 +7472,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{29, 15}, {49, 14}} - YES 68288064 @@ -7520,12 +7486,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {266, 71}} - {{17, 140}, {268, 87}} - {0, 0} 67239424 @@ -7549,7 +7513,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{191, 13}, {96, 28}} - 1 YES @@ -7571,7 +7534,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{97, 13}, {96, 28}} - YES 67239424 @@ -7589,8 +7551,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {302, 307} - - {{0, 0}, {1440, 878}} {3.40282e+38, 3.40282e+38} @@ -7628,11 +7588,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {418, 140} YES - - + + 256 {418, 17} - + @@ -7688,6 +7648,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 17}, {418, 140}} + 4 @@ -7712,16 +7673,17 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _doScroller: 9.565217e-01 - + 2304 YES - + {{1, 0}, {418, 17}} - + + 4 @@ -7729,31 +7691,32 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{-1, 22}, {420, 158}} + 514 - + QSAAAEEgAABBcAAAQXAAAA - + 290 YES - - + + 292 {{61, 0}, {32, 24}} - + YES - + 67239424 134348800 - + -2033958657 35 @@ -7766,39 +7729,39 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 25 - - + + 292 {{-1, 0}, {32, 24}} - + YES - + 67239424 134348800 - + -2033958657 163 - + 200 25 - - + + 292 {{30, 0}, {32, 24}} - + YES - + 67239424 134348800 - + -2033958657 163 @@ -7811,18 +7774,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 25 - - + + 289 {{339, 3}, {60, 17}} - + YES - + -2080244224 134348800 Close - + -2038152961 164 @@ -7846,7 +7809,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {213, 147} {3.40282e+38, 3.40282e+38} - + 3 2 {{101, 476}, {379, 139}} @@ -7858,32 +7821,32 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {3.40282e+38, 3.40282e+38} {213, 50} - + 256 YES - - + + 1280 {{18, 56}, {343, 20}} - + 16394 1.000000e+02 - - + + 256 {{59, 84}, {300, 17}} - + YES - + 67239488 4197120 SW1wb3J0aW5n4oCmA - + 3 @@ -7894,18 +7857,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - + + 256 {{279, 12}, {83, 32}} - + YES - + 67239424 134217728 Cancel - + -2038284033 1 @@ -7915,13 +7878,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 25 - - + + 256 {{59, 104}, {300, 17}} - + YES - + 67239488 4196352 RG9pbmcgU3R1ZmbigKY @@ -7930,13 +7893,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1.300000e+01 2072 - + - - + + 268 YES @@ -7951,9 +7914,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{20, 87}, {32, 32}} - + YES - + 130560 33554432 @@ -8140,8 +8103,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Image 2147483647 - - + + _popUpItemAction: @@ -8150,7 +8113,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Sound (m4a) 2147483647 - + _popUpItemAction: 1 @@ -8160,8 +8123,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Sound (mp3) 2147483647 - - + + _popUpItemAction: 2 @@ -8171,8 +8134,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Sound (linear) 2147483647 - - + + _popUpItemAction: 3 @@ -8182,8 +8145,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Movie 2147483647 - - + + _popUpItemAction: 4 @@ -8193,8 +8156,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 pdf 2147483647 - - + + _popUpItemAction: 5 @@ -8204,8 +8167,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 html 2147483647 - - + + _popUpItemAction: 6 @@ -8215,8 +8178,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 doc 2147483647 - - + + _popUpItemAction: 7 @@ -8226,8 +8189,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 rtf 2147483647 - - + + _popUpItemAction: 8 @@ -8359,6 +8322,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {667, 370} + @@ -8388,6 +8352,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 39}, {667, 370}} + 528 @@ -8501,6 +8466,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {667, 370} + @@ -8530,6 +8496,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 39}, {667, 370}} + 528 @@ -8648,13 +8615,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6 - {669, 1e+07} + {753, 1e+07} {87, 0} {{1, 1}, {370, 204}} + @@ -8684,6 +8652,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{-1, 35}, {383, 206}} + 18 @@ -8837,6 +8806,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 17}, {399, 251}} + 4 @@ -8870,6 +8840,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 0}, {399, 17}} + 4 @@ -8878,6 +8849,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{-1, 39}, {412, 269}} + 18 @@ -8927,18 +8899,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 25 - + 268 {{9, 316}, {97, 14}} YES - + 68288064 272761856 Server Variables - + @@ -8984,22 +8956,22 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 25 - + 274 YES - - + + 2304 YES - - + + 2322 {566, 72} - - + + @@ -9007,7 +8979,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + YES YES @@ -9017,7 +8989,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + 1 MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA @@ -9130,7 +9102,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - + YES YES @@ -9140,7 +9112,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + LucidaGrande-Bold 1.000000e+01 @@ -9194,12 +9166,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + 6 - + 5.660000e+02 1 @@ -9237,35 +9209,36 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6 - {586, 1e+07} - {228, 57} + {1144, 1e+07} + {228, 0} {566, 279} - - + + + 2 - - + + 256 {{566, 0}, {12, 279}} - + 2 - + _doScroller: 8.870056e-01 - - + + 256 {{-100, -100}, {574, 15}} - + 1 - + _doScroller: 1.000000e+00 9.456522e-01 @@ -9273,10 +9246,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 34}, {578, 279}} + 16 - - - + + + {580, 320} @@ -9298,7 +9272,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {3.40282e+38, 3.40282e+38} {213, 107} - + 256 YES @@ -9307,7 +9281,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 264 {{20, 233}, {140, 14}} - YES 67239424 @@ -9334,7 +9307,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2322 {352, 14} - @@ -9383,7 +9355,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {352, 178}} - + @@ -9394,7 +9366,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 {{353, 1}, {11, 178}} - 256 _doScroller: @@ -9405,7 +9376,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 {{-100, -100}, {87, 18}} - 257 _doScroller: @@ -9415,7 +9385,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{20, 45}, {365, 180}} - + 18 @@ -9426,7 +9396,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 257 {{314, 13}, {76, 28}} - YES 67239424 @@ -9445,8 +9414,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {405, 267} - - {{0, 0}, {1440, 878}} {213, 129} @@ -9466,22 +9433,22 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 YES - + 274 YES - - + + 2304 YES - - + + 2322 {566, 72} - - + + @@ -9489,8 +9456,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - - + + GQAEAQgADAEiAAcBhAQAA @@ -9499,12 +9466,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + 6 - + 5.660000e+02 1 @@ -9542,35 +9509,36 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6 - {578, 1e+07} - {228, 60} + {1144, 1e+07} + {228, 0} {566, 293} - - + + + 2 - - + + 256 {{566, 0}, {12, 293}} - + 2 - + _doScroller: 9.570552e-01 - - + + 256 {{-100, -100}, {87, 18}} - + 1 - + _doScroller: 1.000000e+00 9.456522e-01 @@ -9578,10 +9546,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 20}, {578, 293}} + 16 - - - + + + {580, 320} @@ -9631,6 +9600,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {505, 271} + @@ -10201,6 +10171,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 17}, {423, 141}} + 6 @@ -10234,6 +10205,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 0}, {423, 17}} + 4 @@ -10242,6 +10214,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{20, 45}, {425, 159}} + 530 @@ -10903,6 +10876,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {198, 107}} + 4 @@ -10930,6 +10904,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{20, 20}, {211, 109}} + 18 @@ -10950,7 +10925,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 113508607 2 - + @@ -11551,7 +11526,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 113508607 2 - + @@ -11671,6 +11646,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {198, 115}} + 4 @@ -11698,6 +11674,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{20, 20}, {211, 117}} + 18 @@ -11774,7 +11751,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 116654335 2 - + @@ -11873,6 +11850,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {198, 115}} + 4 @@ -11900,6 +11878,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{20, 20}, {211, 117}} + 18 @@ -12390,8 +12369,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -12407,8 +12386,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -12472,8 +12451,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -12490,8 +12469,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + _popUpItemAction: @@ -12500,8 +12479,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 QWRkIERhdGFiYXNl4oCmA 2147483647 - - + + _popUpItemAction: @@ -12513,8 +12492,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 1 - - + + _popUpItemAction: @@ -12531,7 +12510,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSView - + 265 YES @@ -12550,7 +12529,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NeXT TIFF v4.0 pasteboard type - {{14, 0}, {22, 22}} + {{13, -2}, {22, 22}} YES @@ -12563,8 +12542,33 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES + + + 258 + {{2, 2}, {105, 14}} + + YES + + 68288064 + 71435264 + + + + + + 6 + System + disabledControlTextColor + + 3 + MC4zMzMzMzMzNAA + + + + - {50, 22} + {110, 20} + NSView @@ -16148,7 +16152,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 syntaxViewContent - + 6087 @@ -16156,7 +16160,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 syntaxView - + 6088 @@ -16164,7 +16168,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 errorDetailText - + 6093 @@ -16172,7 +16176,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 closeQueryFavoritesSheet: - + 6111 @@ -16180,7 +16184,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 addQueryFavorite: - + 6112 @@ -16188,7 +16192,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 removeQueryFavorite: - + 6113 @@ -16196,7 +16200,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 copyQueryFavorite: - + 6114 @@ -16204,7 +16208,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 singleProgressBar - + 6138 @@ -16212,7 +16216,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 singleProgressSheet - + 6139 @@ -16220,7 +16224,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 singleProgressText - + 6140 @@ -16228,7 +16232,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 cancelProgressBar: - + 6141 @@ -16236,7 +16240,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 toggleCollapse: - + 6161 @@ -16244,7 +16248,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 updateTables: - + 6162 @@ -16252,7 +16256,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 addTable: - + 6163 @@ -16260,7 +16264,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 renameTable: - + 6164 @@ -16268,7 +16272,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 copyTable: - + 6165 @@ -16276,7 +16280,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 truncateTable: - + 6166 @@ -16284,10 +16288,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 removeTable: - + 6167 + + + titleStringView + + + + 6172 + @@ -16884,7 +16896,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + @@ -16897,7 +16909,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - + @@ -17035,7 +17047,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + @@ -18224,7 +18236,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + @@ -18950,7 +18962,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + @@ -22440,6 +22452,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES + Title Icon View @@ -22487,7 +22500,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + @@ -22698,342 +22711,356 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6083 - + YES - - - + + + 6084 - - + + 6085 - - + + 6086 - - + + 6089 - + YES - - - + + + 6090 - - + + 6091 - - + + 6092 - - + + 6094 - + YES - - - - + + + + 6102 - + 6107 - + YES - + - + 6108 - - + + 6100 - + YES - + - + 6101 - - + + 6103 - + YES - + - + 6104 - - + + 6109 - + YES - + - + 6110 - - + + 6116 - + YES - + 6117 - - + + 6125 - + YES - + Progress Sheet 6126 - + YES - - - - - + + + + + - + 6127 - + YES - + - + 6129 - + YES - + - + 6130 - + YES - + - + 6131 - - + + 6132 - + YES - + - + 6133 - - + + 6134 - - + + 6135 - - + + 6137 - - + + 6142 - + YES - - - - + + + + 6143 - + YES - + - + 6144 - - + + 6145 - + YES - + - + 6146 - + YES - + - + 6147 - + YES - - - - - - + + + + + + - + 6151 - + YES - + - + 6152 - - + + 6153 - + YES - + - + 6154 - - + + 6156 - - + + 6157 - - + + 6158 - - + + 6159 - - + + 6160 - - + + 6148 - - + + + + + 6170 + + + YES + + + + + + 6171 + + @@ -24373,6 +24400,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6094.IBPluginDependency 6100.IBPluginDependency 6101.IBPluginDependency + 6102.IBPluginDependency 6103.IBPluginDependency 6104.IBPluginDependency 6107.IBPluginDependency @@ -24398,6 +24426,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6131.ImportedFromIB2 6132.IBPluginDependency 6132.ImportedFromIB2 + 6133.IBPluginDependency + 6134.IBPluginDependency + 6135.IBPluginDependency + 6137.IBPluginDependency 614.IBPluginDependency 614.ImportedFromIB2 6142.IBPluginDependency @@ -24422,6 +24454,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6160.IBPluginDependency 617.IBPluginDependency 617.ImportedFromIB2 + 6170.IBPluginDependency + 6171.IBPluginDependency 654.IBPluginDependency 654.ImportedFromIB2 655.IBPluginDependency @@ -25578,8 +25612,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{773, 270}, {944, 550}} - {{773, 270}, {944, 550}} + {{342, 190}, {944, 550}} + {{342, 190}, {944, 550}} {{62, 352}, {845, 504}} @@ -26194,7 +26228,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{528, 162}, {50, 22}} + {{567, 305}, {110, 20}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26249,6 +26283,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit + com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -26275,13 +26310,17 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik 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.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{860, 192}, {157, 98}} + {{400, 219}, {157, 98}} com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -26292,7 +26331,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik ToolTip ToolTip - + Rename the selected item @@ -26301,7 +26340,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik ToolTip ToolTip - + Duplicate the selected item @@ -26312,13 +26351,15 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik ToolTip ToolTip - + Remove the selected item(s) com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26539,7 +26580,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 6167 + 6172 @@ -27416,6 +27457,7 @@ Y2hhbmdlIHRoZSBvcmRlcg tablesListInstance titleAccessoryView titleImageView + titleStringView userField variablesSheet variablesTableView @@ -27474,6 +27516,7 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id + id diff --git a/Source/CMMCPConnection.m b/Source/CMMCPConnection.m index e31b9765..90b915fe 100644 --- a/Source/CMMCPConnection.m +++ b/Source/CMMCPConnection.m @@ -306,7 +306,8 @@ static void forcePingTimeout(int signalNumber); if (connectionTunnel) { [connectionTunnel disconnect]; - [delegate setStatusIconToImageWithName:@"ssh-disconnected"]; + [delegate setTitlebarStatus:@"SSH Disconnected"]; + //[delegate setStatusIconToImageWithName:@"ssh-disconnected"]; } if( serverVersionString != nil ) { @@ -405,19 +406,24 @@ static void forcePingTimeout(int signalNumber); [connectionTunnel setConnectionStateChangeSelector:nil delegate:nil]; if ([connectionTunnel state] != SPSSH_STATE_IDLE) [connectionTunnel disconnect]; [connectionTunnel connect]; - [delegate setStatusIconToImageWithName:@"ssh-connecting"]; + + [delegate setTitlebarStatus:@"SSH Connecting…"]; + //[delegate setStatusIconToImageWithName:@"ssh-connecting"]; + NSDate *tunnelStartDate = [NSDate date], *interfaceInteractionTimer; // Allow the tunnel to attempt to connect in a loop while (1) { if ([connectionTunnel state] == SPSSH_STATE_CONNECTED) { - [delegate setStatusIconToImageWithName:@"ssh-connected"]; + [delegate setTitlebarStatus:@"SSH Connected"]; + //[delegate setStatusIconToImageWithName:@"ssh-connected"]; connectionPort = [connectionTunnel localPort]; break; } if ([[NSDate date] timeIntervalSinceDate:tunnelStartDate] > (connectionTimeout + 1)) { [connectionTunnel disconnect]; - [delegate setStatusIconToImageWithName:@"ssh-disconnected"]; + [delegate setTitlebarStatus:@"SSH Disconnected"]; + //[delegate setStatusIconToImageWithName:@"ssh-disconnected"]; break; } @@ -501,9 +507,14 @@ static void forcePingTimeout(int signalNumber); int newState = [theTunnel state]; if (delegate && [delegate respondsToSelector:@selector(setStatusIconToImageWithName:)]) { - if (newState == SPSSH_STATE_IDLE) [delegate setStatusIconToImageWithName:@"ssh-disconnected"]; - else if (newState == SPSSH_STATE_CONNECTED) [delegate setStatusIconToImageWithName:@"ssh-connected"]; - else [delegate setStatusIconToImageWithName:@"ssh-connecting"]; + if (newState == SPSSH_STATE_IDLE) [delegate setTitlebarStatus:@"SSH Disconnected"]; + else if (newState == SPSSH_STATE_CONNECTED) [delegate setTitlebarStatus:@"SSH Connected"]; + else [delegate setTitlebarStatus:@"SSH Connecting…"]; + + +// if (newState == SPSSH_STATE_IDLE) [delegate setStatusIconToImageWithName:@"ssh-disconnected"]; +// else if (newState == SPSSH_STATE_CONNECTED) [delegate setStatusIconToImageWithName:@"ssh-connected"]; +// else [delegate setStatusIconToImageWithName:@"ssh-connecting"]; } // Restart the tunnel if it dies @@ -674,7 +685,8 @@ static void forcePingTimeout(int signalNumber); [self setLastErrorMessage:nil]; if (connectionTunnel) { [connectionTunnel disconnect]; - [delegate setStatusIconToImageWithName:@"ssh-disconnected"]; + [delegate setTitlebarStatus:@"SSH Disconnected"]; + //[delegate setStatusIconToImageWithName:@"ssh-disconnected"]; } return NO; } diff --git a/Source/TableDocument.h b/Source/TableDocument.h index 6b6ad5f8..e8702648 100644 --- a/Source/TableDocument.h +++ b/Source/TableDocument.h @@ -51,8 +51,11 @@ IBOutlet id spExportControllerInstance; IBOutlet id tableWindow; + IBOutlet id titleAccessoryView; IBOutlet id titleImageView; + IBOutlet id titleStringView; + IBOutlet id connectSheet; IBOutlet id databaseSheet; IBOutlet id variablesSheet; @@ -221,6 +224,7 @@ // titlebar methods - (void)setStatusIconToImageWithName:(NSString *)imagePath; +- (void)setTitlebarStatus:(NSString *)status; - (void)clearStatusIcon; //toolbar methods diff --git a/Source/TableDocument.m b/Source/TableDocument.m index 93b22cae..3cc11425 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -120,7 +120,7 @@ NSString *TableDocumentFavoritesControllerSelectionIndexDidChange = @"TableDocum NSView *windowFrame = [[tableWindow contentView] superview]; NSRect av = [titleAccessoryView frame]; NSRect initialAccessoryViewFrame = NSMakeRect( - [windowFrame frame].size.width - av.size.width - 20, + [windowFrame frame].size.width - av.size.width - 30, [windowFrame frame].size.height - av.size.height, av.size.width, av.size.height); @@ -397,13 +397,16 @@ NSString *TableDocumentFavoritesControllerSelectionIndexDidChange = @"TableDocum int newState = [theTunnel state]; if (newState == SPSSH_STATE_IDLE) { - [self setStatusIconToImageWithName:@"ssh-disconnected"]; + [self setTitlebarStatus:@"SSH Disconnected"]; + //[self setStatusIconToImageWithName:@"ssh-disconnected"]; [self failConnectionWithErrorMessage:[theTunnel lastError] withDetail:[sshTunnel debugMessages]]; } else if (newState == SPSSH_STATE_CONNECTED) { - [self setStatusIconToImageWithName:@"ssh-connected"]; + [self setTitlebarStatus:@"SSH Connected"]; + //[self setStatusIconToImageWithName:@"ssh-connected"]; [self initiateMySQLConnection]; } else { - [self setStatusIconToImageWithName:@"ssh-connecting"]; + [self setTitlebarStatus:@"SSH Connecting…"]; + //[self setStatusIconToImageWithName:@"ssh-connecting"]; } } @@ -2081,6 +2084,12 @@ NSString *TableDocumentFavoritesControllerSelectionIndexDidChange = @"TableDocum [titleImageView setImage:image]; } +- (void)setTitlebarStatus:(NSString *)status +{ + [self clearStatusIcon]; + [titleStringView setStringValue:status]; +} + /** * Clear the connection status icon in the titlebar */ @@ -2089,6 +2098,10 @@ NSString *TableDocumentFavoritesControllerSelectionIndexDidChange = @"TableDocum [titleImageView setImage:nil]; } + + + + #pragma mark - #pragma mark Toolbar Methods -- cgit v1.2.3