From a531651aac81aaa89e2c292be7f9273d8b629373 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Tue, 24 Jul 2012 01:27:44 +0000 Subject: - Replace the main split view in the main view with a SPSplitView, replacing the anchored button bar and buttons with normal equivalents. - Make the main split view collapsbile to avoid resize issues with the filter box - Fix problems with additional drag handles in SPSplitView when one of the views was using flipped coordinates - Fix problems with manually dragged uncollapses in SPSplitView - Fix problems instantiating SPSplitView instances on 10.5 (with thanks to schlabberdog) --- Interfaces/English.lproj/DBView.xib | 2566 ++++++++++++++++---------------- Resources/Images/button_pane_hide.tiff | Bin 0 -> 704 bytes Resources/Images/button_pane_show.tiff | Bin 0 -> 696 bytes Source/SPDatabaseDocument.h | 5 +- Source/SPDatabaseDocument.m | 24 +- Source/SPSplitView.m | 13 +- sequel-pro.xcodeproj/project.pbxproj | 8 + 7 files changed, 1337 insertions(+), 1279 deletions(-) create mode 100644 Resources/Images/button_pane_hide.tiff create mode 100644 Resources/Images/button_pane_show.tiff diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 155a42f8..aaa72bd8 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,7 +23,7 @@ YES - + @@ -52,7 +52,7 @@ 274 YES - + 274 @@ -62,321 +62,6 @@ 272 YES - - - 290 - - YES - - - 268 - {{-1, -1}, {32, 24}} - - YES - - 67239424 - 134348800 - - - LucidaGrande - 11 - 3088 - - - 113524991 - 163 - - NSImage - NSAddTemplate - - - - 200 - 25 - - - - - 268 - {{30, -1}, {32, 24}} - - YES - - 71433792 - 134219776 - - LucidaGrande - 13 - 1040 - - - -2038284033 - 163 - - - 400 - 75 - - - YES - - - 1048576 - 2147483647 - - 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: - - - - - YES - YES - - - 2147483647 - - - _popUpItemAction: - - - - - Open Table in New Tab - - 2147483647 - - - _popUpItemAction: - - - - - YES - YES - - - 2147483647 - - - _popUpItemAction: - - - - - Export - - 2147483647 - - - submenuAction: - - Export - - YES - - - As SQL dump... - - 2147483647 - - - _popUpItemAction: - - - - - As CSV file... - - 2147483647 - - - _popUpItemAction: - 1 - - - - - As XML file... - - 2147483647 - - - _popUpItemAction: - 2 - - - - - - - - YES - YES - - - 2147483647 - - - _popUpItemAction: - - - - - Show Create Table Syntax... - - 2147483647 - - - _popUpItemAction: - - - - - Copy Create Table Syntax - - 2147483647 - - - _popUpItemAction: - - - - - YES - 1 - YES - YES - - - - - 268 - {{61, -1}, {32, 24}} - - YES - - 67239424 - 134348800 - - - - 113524991 - 163 - - NSImage - NSRefreshTemplate - - - - 200 - 25 - - - - - 268 - {{92, -1}, {32, 24}} - - YES - - 67239424 - 134348800 - - - - -926662401 - 163 - - NSImage - button_pane_hide_icon - - - NSImage - button_pane_show_icon - - - - 200 - 25 - - - - {{0, 1}, {214, 23}} - - YES - YES - NO - 0 - 274 @@ -428,7 +113,11 @@ 75628096 2048 - + + LucidaGrande + 11 + 3088 + 3 MC4zMzMzMzI5ODU2AA @@ -447,7 +136,11 @@ 69336641 2048 Text Cell - + + LucidaGrande + 13 + 1040 + 6 @@ -774,7 +467,7 @@ 4352 - {216, 145} + {216, 146} YES @@ -838,7 +531,7 @@ 1 - {216, 145} + {216, 146} @@ -865,7 +558,7 @@ 0.76156586408615112 - {{-1, 0}, {216, 145}} + {{-1, 0}, {216, 146}} 133648 @@ -887,7 +580,7 @@ 4352 - {214, 145} + {214, 146} YES @@ -951,7 +644,7 @@ 1 - {214, 145} + {214, 146} @@ -979,7 +672,7 @@ 0.99047619104385376 - {214, 145} + {214, 146} 133632 @@ -989,14 +682,378 @@ QSAAAEEgAABBmAAAQZgAAA - {{0, 380}, {214, 145}} + {{0, 380}, {214, 146}} - {{0, 24}, {214, 525}} + {{0, 23}, {214, 526}} 2 + + + 290 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {214, 23} + + YES + + 130560 + 33554432 + + NSImage + button_bar_spacer + + 0 + 1 + 0 + NO + + YES + + + + 257 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{199, 0}, {15, 23}} + + _NS:2165 + YES + + 130560 + 33554432 + + NSImage + button_bar_handle + + _NS:2165 + 0 + 1 + 0 + NO + + YES + + + + 260 + {{-1, -1}, {32, 25}} + + YES + + 67239424 + 134217728 + + + + -2042347265 + 402653219 + + NSImage + button_add + + + a + 400 + 75 + + + + + 260 + {{92, -1}, {32, 25}} + + YES + + 67239424 + 134217728 + + + + -935051009 + 402653219 + + NSImage + button_pane_hide + + + NSImage + button_pane_show + + + a + 400 + 75 + + + + + 260 + {{30, -1}, {36, 25}} + + _NS:791 + YES + + 71433792 + 134350848 + + _NS:791 + + -2044051201 + 35 + + + 400 + 75 + + + YES + + + 1048576 + 2147483647 + 1 + + NSImage + button_action + + + 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: + + + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + + + + Open Table in New Tab + + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + + + + Export + + 2147483647 + + + submenuAction: + + Export + + YES + + + As SQL dump... + + 2147483647 + + + _popUpItemAction: + + + + + As CSV file... + + 2147483647 + + + _popUpItemAction: + 1 + + + + + As XML file... + + 2147483647 + + + _popUpItemAction: + 2 + + + + + + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + + + + Show Create Table Syntax... + + 2147483647 + + + _popUpItemAction: + + + + + Copy Create Table Syntax + + 2147483647 + + + _popUpItemAction: + + + + + + YES + 1 + YES + YES + + + + + 260 + {{61, -0.5}, {32, 25}} + + YES + + 67239424 + 134217728 + + + + -2042347265 + 402653219 + + NSImage + button_refresh + + + a + 400 + 75 + + {214, 549} @@ -1054,9 +1111,12 @@ 1048576 2147483647 - - - + + NSImage + NSActionTemplate + + + _popUpItemAction: @@ -1071,8 +1131,8 @@ View Columns 2147483647 - - + + submenuAction: View Columns @@ -1084,8 +1144,8 @@ 2147483647 1 - - + + _popUpItemAction: 7 @@ -1096,8 +1156,8 @@ 2147483647 1 - - + + _popUpItemAction: 10 @@ -1108,8 +1168,8 @@ 2147483647 1 - - + + _popUpItemAction: 11 @@ -1120,8 +1180,8 @@ 2147483647 1 - - + + _popUpItemAction: 12 @@ -1184,11 +1244,10 @@ - - + + -2147483392 {{-26, 0}, {16, 17}} - YES @@ -1784,7 +1843,6 @@ 4 - {{-1, 22}, {696, 306}} @@ -1810,10 +1868,7 @@ -2042347265 402653219 - - NSImage - button_add - + a 400 @@ -1834,10 +1889,7 @@ -2041822977 268435491 - - NSImage - button_refresh - + r 400 @@ -1913,10 +1965,7 @@ 130560 33554432 - - NSImage - button_bar_spacer - + 0 1 0 @@ -2074,11 +2123,10 @@ - - + + -2147483392 {{-26, 0}, {16, 17}} - YES @@ -2373,7 +2421,6 @@ 4 - {{-1, 23}, {696, 158}} @@ -2399,7 +2446,7 @@ -2042347265 35 - + 400 @@ -2420,7 +2467,7 @@ -2041822977 268435491 - + r 400 @@ -2469,7 +2516,7 @@ 130560 33554432 - + 0 1 0 @@ -2497,7 +2544,7 @@ content - + 256 YES @@ -2537,7 +2584,7 @@ 292 - {{6, 10}, {32, 25}} + {{6, 9}, {32, 25}} YES @@ -2548,7 +2595,7 @@ -2042347265 402653219 - + a 400 @@ -2558,7 +2605,7 @@ 292 - {{100, 10}, {32, 25}} + {{100, 9}, {32, 25}} YES @@ -2569,7 +2616,7 @@ -2041822977 268435491 - + r 400 @@ -2579,7 +2626,7 @@ 292 - {{37, 10}, {32, 25}} + {{37, 9}, {32, 25}} YES @@ -2600,7 +2647,7 @@ 292 - {{68, 10}, {32, 25}} + {{68, 9}, {32, 25}} YES @@ -2609,7 +2656,7 @@ - -2042347265 + -2041822977 268435491 @@ -2633,13 +2680,13 @@ NeXT TIFF v4.0 pasteboard type - {{163, 11}, {539, 23}} + {{163, 10}, {539, 23}} YES 130560 33554432 - + 0 1 0 @@ -2650,7 +2697,7 @@ 292 - {{131, 10}, {32, 25}} + {{131, 9}, {32, 25}} YES @@ -2659,7 +2706,7 @@ - -935051009 + -934526721 35 NSImage @@ -2678,7 +2725,7 @@ 290 - {{166, 7}, {421, 22}} + {{166, 6}, {421, 22}} YES @@ -2694,7 +2741,7 @@ 289 - {{654, 10}, {32, 25}} + {{654, 9}, {32, 25}} YES @@ -2718,7 +2765,7 @@ 289 - {{592, 10}, {32, 25}} + {{592, 9}, {32, 25}} YES @@ -2742,7 +2789,7 @@ 289 - {{623, 10}, {32, 25}} + {{623, 9}, {32, 25}} YES @@ -2799,8 +2846,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2847,8 +2894,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -3130,11 +3177,10 @@ - - + + -2147483392 {{-26, 0}, {16, 17}} - YES @@ -3181,7 +3227,7 @@ 1 - {{1, 17}, {694, 456}} + {{1, 16.5}, {694, 456}} @@ -3200,13 +3246,13 @@ -2147483392 - {{1, 458}, {688, 15}} + {{1, 458}, {429, 15}} 1 _doScroller: 0.021626397967338562 - 0.99840247631072998 + 0.68530351437699677 @@ -3215,16 +3261,15 @@ YES - {{1, 0}, {694, 17}} + {{1, -0.5}, {694, 17}} 4 - - {{6, 33}, {696, 474}} + {{6, 32.5}, {696, 474}} 133682 @@ -3236,6 +3281,7 @@ {{10, 7}, {706, 544}} + Content @@ -3244,7 +3290,7 @@ customQuery - + 256 YES @@ -3267,8 +3313,14 @@ -926662401 163 - - + + NSImage + button_pane_show_icon + + + NSImage + button_pane_hide_icon + 200 @@ -3315,9 +3367,9 @@ 1048576 2147483647 - - - + + + _popUpItemAction: @@ -3332,8 +3384,8 @@ Export Result 2147483647 - - + + submenuAction: Export Result @@ -3344,8 +3396,8 @@ As CSV file... 2147483647 - - + + _popUpItemAction: 1 @@ -3355,8 +3407,8 @@ As XML file... 2147483647 - - + + _popUpItemAction: 2 @@ -3435,29 +3487,6 @@ 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 - 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 - - {98, 14} @@ -3737,8 +3766,8 @@ 524288 2147483647 - - + + _popUpItemAction: 300000 @@ -3749,8 +3778,8 @@ Save History… 2147483647 - - + + _popUpItemAction: 300001 @@ -3760,8 +3789,8 @@ Clear History 2147483647 - - + + _popUpItemAction: 300002 @@ -3773,8 +3802,8 @@ 2147483647 - - + + _popUpItemAction: @@ -3783,8 +3812,8 @@ ..placeholder for seachfield.. 2147483647 - - + + _popUpItemAction: @@ -3795,8 +3824,8 @@ 2147483647 - - + + _popUpItemAction: @@ -3851,8 +3880,8 @@ 524288 2147483647 - - + + _popUpItemAction: 100000 @@ -3863,8 +3892,8 @@ Save All to Favorites 2147483647 - - + + _popUpItemAction: 100001 @@ -3875,8 +3904,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -3887,8 +3916,8 @@ 2147483647 - - + + _popUpItemAction: @@ -3897,8 +3926,8 @@ ..placeholder for seachfield.. 2147483647 - - + + _popUpItemAction: @@ -3909,8 +3938,8 @@ 2147483647 - - + + _popUpItemAction: @@ -3947,10 +3976,7 @@ 1048576 2147483647 - - NSImage - button_action - + _popUpItemAction: @@ -3966,8 +3992,8 @@ r 1048576 2147483647 - - + + _popUpItemAction: 1 @@ -3979,8 +4005,8 @@ r 1572864 2147483647 - - + + _popUpItemAction: 2 @@ -3992,8 +4018,8 @@ 2147483647 - - + + _popUpItemAction: @@ -4003,8 +4029,8 @@ 262144 2147483647 - - + + _popUpItemAction: 3 @@ -4015,8 +4041,8 @@ 262144 2147483647 - - + + _popUpItemAction: 4 @@ -4026,8 +4052,8 @@ History Replaces Editor Content 2147483647 - - + + _popUpItemAction: @@ -4038,8 +4064,8 @@ 2147483647 - - + + _popUpItemAction: @@ -4048,8 +4074,8 @@ Favorite Replaces Editor Content 2147483647 - - + + _popUpItemAction: @@ -4060,8 +4086,8 @@ 2147483647 - - + + _popUpItemAction: @@ -4071,8 +4097,8 @@ ] 1048576 2147483647 - - + + _popUpItemAction: 6 @@ -4083,8 +4109,8 @@ [ 1048576 2147483647 - - + + _popUpItemAction: 7 @@ -4095,8 +4121,8 @@ / 1048576 2147483647 - - + + _popUpItemAction: 11 @@ -4109,8 +4135,8 @@ / 1572864 2147483647 - - + + _popUpItemAction: 12 @@ -4120,8 +4146,8 @@ Completion List Gw 2147483647 - - + + _popUpItemAction: 8 @@ -4131,8 +4157,8 @@ Show Completion List 2147483647 - - + + submenuAction: Show Completion List @@ -4144,8 +4170,8 @@ 1 1572864 2147483647 - - + + _popUpItemAction: 8000 @@ -4156,8 +4182,8 @@ 2 1572864 2147483647 - - + + _popUpItemAction: 8001 @@ -4168,8 +4194,8 @@ 3 1572864 2147483647 - - + + _popUpItemAction: 8002 @@ -4184,8 +4210,8 @@ 2147483647 - - + + _popUpItemAction: @@ -4194,8 +4220,8 @@ Editor Font... 2147483647 - - + + _popUpItemAction: @@ -4205,8 +4231,8 @@ 2147483647 1 - - + + _popUpItemAction: 9 @@ -4217,8 +4243,8 @@ 2147483647 1 - - + + _popUpItemAction: 10 @@ -4228,8 +4254,8 @@ Auto-uppercase Keywords 2147483647 - - + + _popUpItemAction: @@ -4238,8 +4264,8 @@ Auto-completion 2147483647 - - + + _popUpItemAction: @@ -4248,8 +4274,8 @@ Update Help while typing 2147483647 - - + + _popUpItemAction: @@ -4325,7 +4351,7 @@ 130560 33554432 - + 0 1 0 @@ -4364,7 +4390,7 @@ 2322 - {223, 13} + {{0, -1}, {223, 14}} @@ -4596,7 +4622,6 @@ {{10, 7}, {706, 544}} - Custom Query @@ -5341,8 +5366,8 @@ NSImage NSAdvanced - - + + _popUpItemAction: @@ -5358,8 +5383,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 2 @@ -5370,8 +5395,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1 @@ -5582,11 +5607,10 @@ - - + + -2147483392 {{-26, 0}, {16, 17}} - YES @@ -5812,7 +5836,6 @@ 4 - {{6, 33}, {696, 472}} @@ -5838,7 +5861,7 @@ -2042347265 402653219 - + a 400 @@ -5859,7 +5882,7 @@ -2041822977 268435491 - + r 400 @@ -5908,7 +5931,7 @@ 130560 33554432 - + 0 1 0 @@ -5969,11 +5992,10 @@ - - + + -2147483392 {{-26, 0}, {16, 17}} - YES @@ -6253,7 +6275,6 @@ 4 - {{6, 33}, {696, 472}} @@ -6279,7 +6300,7 @@ -2042347265 402653219 - + a 400 @@ -6300,7 +6321,7 @@ -2041822977 268435491 - + r 400 @@ -6349,7 +6370,7 @@ 130560 33554432 - + 0 1 0 @@ -6381,14 +6402,14 @@ - + 134217731 YES YES YES - + @@ -6401,47 +6422,6 @@ YES 2 DBViewSplitter - - NO - - - - - - YES - - - YES - - - - YES - - YES - - - - - YES - - - - - - YES - - YES - - - - - YES - - - - - 0 - NO {943, 549} @@ -7279,8 +7259,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -7298,8 +7278,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: 1 @@ -7310,8 +7290,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: 2 @@ -7600,8 +7580,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -7617,8 +7597,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7628,8 +7608,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7785,8 +7765,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: -1 @@ -7802,8 +7782,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Restrict 2147483647 - - + + _popUpItemAction: @@ -7813,8 +7793,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: 1 @@ -7825,8 +7805,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: 2 @@ -7836,8 +7816,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 No Action 2147483647 - - + + _popUpItemAction: 3 @@ -7874,8 +7854,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: -1 @@ -7892,8 +7872,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -7903,8 +7883,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: 1 @@ -7914,8 +7894,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Set NULL 2147483647 - - + + _popUpItemAction: 2 @@ -7925,8 +7905,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 No Action 2147483647 - - + + _popUpItemAction: 3 @@ -8030,8 +8010,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -8047,8 +8027,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -8058,8 +8038,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -8095,8 +8075,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -8112,8 +8092,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -8123,8 +8103,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -8349,8 +8329,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -8366,8 +8346,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -8403,8 +8383,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -8420,8 +8400,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -8431,8 +8411,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -10400,8 +10380,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 1 - - + + _popUpItemAction: @@ -10417,8 +10397,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 o 1572864 2147483647 - - + + _popUpItemAction: @@ -10428,8 +10408,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 a 1572864 2147483647 - - + + _popUpItemAction: 1 @@ -10440,8 +10420,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 d 1048576 2147483647 - - + + _popUpItemAction: @@ -10452,8 +10432,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + _popUpItemAction: @@ -10464,8 +10444,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 s 1572864 2147483647 - - + + _popUpItemAction: 2 @@ -10936,8 +10916,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -10954,8 +10934,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + _popUpItemAction: @@ -10964,8 +10944,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Add Database… 2147483647 - - + + _popUpItemAction: @@ -10977,8 +10957,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 1 - - + + _popUpItemAction: @@ -11515,16 +11495,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Rename Table... 2147483647 - - + + Duplicate Table... 2147483647 - - + + @@ -11533,24 +11513,24 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + Truncate Table... 2147483647 - - + + Remove Table... 2147483647 - - + + @@ -11559,16 +11539,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + Open Table in New Tab 2147483647 - - + + @@ -11577,16 +11557,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + Export 2147483647 - - + + submenuAction: Export @@ -11597,16 +11577,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 As SQL dump... 2147483647 - - + + As CSV file... 2147483647 - - + + 1 @@ -11614,8 +11594,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 As XML file... 2147483647 - - + + 2 @@ -11628,24 +11608,24 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + Show Create Table Syntax... 2147483647 - - + + Copy Create Table Syntax 2147483647 - - + + @@ -11658,8 +11638,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Delete Index 2147483647 - - + + @@ -11668,16 +11648,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + Reset AUTO_INCREMENT… 2147483647 - - + + 1 @@ -11691,16 +11671,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Delete Field 2147483647 - - + + Duplicate Field 2147483647 - - + + @@ -11709,16 +11689,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + Show Optimized Field Type 2147483647 - - + + @@ -11731,8 +11711,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Copy 2147483647 - - + + 2001 @@ -11740,8 +11720,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Copy with Column Names 2147483647 - - + + 2002 @@ -11749,8 +11729,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Copy as SQL INSERT 2147483647 - - + + 2003 @@ -11760,16 +11740,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + Add New Row 2147483647 - - + + @@ -11778,24 +11758,24 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + Duplicate Row 2147483647 - - + + Delete Row 2147483647 - - + + @@ -11808,8 +11788,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Copy 2147483647 - - + + 2001 @@ -11817,8 +11797,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Copy with Column Names 2147483647 - - + + 2002 @@ -11826,8 +11806,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Copy as SQL INSERT 2147483647 - - + + 2003 @@ -11838,8 +11818,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + @@ -11847,8 +11827,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Delete Row 2147483647 - - + + @@ -11861,8 +11841,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Delete Relation 2147483647 - - + + @@ -11875,16 +11855,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Edit Trigger 2147483647 - - + + Delete Trigger 2147483647 - - + + @@ -13316,54 +13296,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6141 - - - updateTables: - - - - 6162 - - - - addTable: - - - - 6163 - - - - renameTable: - - - - 6164 - - - - copyTable: - - - - 6165 - - - - truncateTable: - - - - 6166 - - - - removeTable: - - - - 6167 - titleStringView @@ -13380,38 +13312,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6187 - - - duplicateTableMenuItem - - - - 6189 - - - - separatorTableMenuItem - - - - 6191 - - - - truncateTableButton - - - - 6192 - - - - removeTableMenuItem - - - - 6193 - renameTable: @@ -13420,14 +13320,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6194 - - - renameTableMenuItem - - - - 6196 - copyTable: @@ -13588,14 +13480,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6257 - - - togglePaneCollapse: - - - - 6258 - tableListFilterSplitView @@ -14093,30 +13977,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6625 - - - toolbarReloadButton - - - - 6626 - - - - toolbarActionsButton - - - - 6627 - - - - toolbarAddButton - - - - 6628 - closePanelSheet: @@ -14749,14 +14609,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6925 - - - showCreateTableSyntax: - - - - 6928 - showCreateSyntaxContextMenuItem @@ -14765,14 +14617,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6929 - - - showCreateSyntaxMenuItem - - - - 6930 - delegate @@ -15037,38 +14881,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7060 - - - exportSelectedTablesAs: - - - - 7066 - - - - exportSelectedTablesAs: - - - - 7067 - - - - exportSelectedTablesAs: - - - - 7068 - - - - separatorTableMenuItem2 - - - - 7070 - tableContentInstance @@ -15965,14 +15777,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7436 - - - sidebarGrabber - - - - 7437 - customQueryTextView @@ -16381,22 +16185,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7685 - - - openTableInNewTab: - - - - 7687 - - - - openTableInNewTabMenuItem - - - - 7688 - tableInfoScrollView @@ -16501,14 +16289,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7792 - - - separatorTableMenuItem3 - - - - 7793 - addRow: @@ -16573,22 +16353,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7830 - - - copyCreateTableSyntax: - - - - 7832 - - - - copyCreateSyntaxMenuItem - - - - 7833 - duplicateField: @@ -16637,21 +16401,237 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7839 + + + delegate + + + + 7841 + + + + toolbarAddButton + + + + 7853 + + + + addTable: + + + + 7854 + + + + showCreateTableSyntax: + + + + 7933 + + + + exportSelectedTablesAs: + + + + 7934 + + + + exportSelectedTablesAs: + + + + 7935 + + + + exportSelectedTablesAs: + + + + 7936 + + + + removeTable: + + + + 7937 + + + + truncateTable: + + + + 7938 + + + + copyCreateTableSyntax: + + + + 7939 + + + + openTableInNewTab: + + + + 7940 + + + + renameTable: + + + + 7941 + + + + copyTable: + + + + 7942 + + + + toolbarActionsButton + + + + 7943 + + + + renameTableMenuItem + + + + 7944 + + + + duplicateTableMenuItem + + + + 7945 + + + + truncateTableButton + + + + 7946 + + + + removeTableMenuItem + + + + 7947 + + + + openTableInNewTabMenuItem + + + + 7948 + + + + showCreateSyntaxMenuItem + + + + 7949 + + + + copyCreateSyntaxMenuItem + + + + 7950 + + + + separatorTableMenuItem + + + + 7951 + + + + separatorTableMenuItem2 + + + + 7952 + + + + separatorTableMenuItem3 + + + + 7953 + + + + updateFilter: + + + + 7957 + + + + toolbarReloadButton + + + + 7958 + + + + togglePaneCollapse: + + + + 7962 + collapseToggleButton - + - 7840 + 7963 - delegate - - + additionalDragHandleView + + - 7841 + 7964 @@ -19834,7 +19814,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + + + + + + @@ -22859,184 +22844,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - 6142 - - - YES - - - - - - - - - 6153 - - - YES - - - - - - 6151 - - - YES - - - - - - 6145 - - - YES - - - - - - 6143 - - - YES - - - - - - 6144 - - - - - 6146 - - - YES - - - - - - 6147 - - - YES - - - - - - - - - - - - - - - - - - 6927 - - - - - 6926 - - - - - 6148 - - - - - 6160 - - - - - 6159 - - - - - 6158 - - - - - 6157 - - - - - 6156 - - - - - 7061 - - - YES - - - - - - 7069 - - - - - 7686 - - - - - 7062 - - - YES - - - - - - - - 7063 - - - - - 7064 - - - - - 7065 - - - - - 6152 - - - - - 6154 - - - 7777 @@ -23209,11 +23016,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - 7794 - - - 7795 @@ -23343,9 +23145,208 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 7831 - - + 7846 + + + YES + + + + + + 7847 + + + + + 7848 + + + YES + + + + + + 7849 + + + + + 7850 + + + YES + + + + + + 7851 + + + + + 7859 + + + YES + + + + + + 7860 + + + YES + + + + + + 7861 + + + YES + + + + + + + + + + + + + + + + + + 7928 + + + + + 7927 + + + + + 7926 + + + + + 7925 + + + YES + + + + + + 7924 + + + + + 7923 + + + + + 7922 + + + + + 7921 + + + + + 7920 + + + + + 7919 + + + + + 7918 + + + + + 7917 + + + + + 7862 + + + + + 7929 + + + YES + + + + + + + + 7932 + + + + + 7931 + + + + + 7930 + + + + + 7954 + + + YES + + + + + + 7955 + + + + + 7959 + + + YES + + + + + + 7960 + + @@ -23445,6 +23446,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 26.IBPluginDependency 26.ImportedFromIB2 261.IBPluginDependency + 261.IBViewBoundsToFrameTransform 261.ImportedFromIB2 27.IBPluginDependency 27.IBUserGuides @@ -23659,6 +23661,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 516.ImportedFromIB2 5175.IBAttributePlaceholdersKey 5175.IBPluginDependency + 5175.IBViewBoundsToFrameTransform 5176.IBAttributePlaceholdersKey 5176.IBPluginDependency 5177.IBAttributePlaceholdersKey @@ -23666,6 +23669,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5178.IBAttributePlaceholdersKey 5178.IBPluginDependency 5179.IBPluginDependency + 5179.IBViewBoundsToFrameTransform 5180.IBPluginDependency 5181.IBPluginDependency 5182.IBPluginDependency @@ -23977,30 +23981,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6134.IBPluginDependency 6135.IBPluginDependency 6137.IBPluginDependency - 6142.IBPluginDependency - 6143.IBAttributePlaceholdersKey - 6143.IBPluginDependency - 6144.IBPluginDependency - 6145.IBPluginDependency - 6146.IBPluginDependency - 6147.IBEditorWindowLastContentRect - 6147.IBPluginDependency - 6148.IBPluginDependency - 6151.IBAttributePlaceholdersKey - 6151.IBPluginDependency - 6152.IBPluginDependency - 6153.IBAttributePlaceholdersKey - 6153.IBPluginDependency - 6154.IBPluginDependency - 6156.IBAttributePlaceholdersKey - 6156.IBPluginDependency - 6157.IBAttributePlaceholdersKey - 6157.IBPluginDependency - 6158.IBPluginDependency - 6159.IBAttributePlaceholdersKey - 6159.IBPluginDependency - 6160.IBAttributePlaceholdersKey - 6160.IBPluginDependency 6170.IBPluginDependency 6171.IBPluginDependency 6180.IBEditorWindowLastContentRect @@ -24310,8 +24290,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6902.IBPluginDependency 6922.IBPluginDependency 6923.IBPluginDependency - 6926.IBPluginDependency - 6927.IBPluginDependency 6937.IBEditorWindowLastContentRect 6937.IBPluginDependency 6937.IBWindowTemplateEditedContentRect @@ -24375,13 +24353,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7054.IBPluginDependency 7055.IBPluginDependency 7056.IBPluginDependency - 7061.IBPluginDependency - 7062.IBEditorWindowLastContentRect - 7062.IBPluginDependency - 7063.IBPluginDependency - 7064.IBPluginDependency - 7065.IBPluginDependency - 7069.IBPluginDependency 711.IBPluginDependency 711.ImportedFromIB2 713.IBPluginDependency @@ -24673,7 +24644,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7661.IBPluginDependency 7668.IBPluginDependency 7683.IBPluginDependency - 7686.IBPluginDependency 7691.IBPluginDependency 7691.ImportedFromIB2 7692.IBPluginDependency @@ -24690,6 +24660,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7722.IBPluginDependency 7723.IBPluginDependency 7724.IBPluginDependency + 7727.CustomClassName 7727.IBPluginDependency 7728.IBPluginDependency 7729.IBPluginDependency @@ -24697,7 +24668,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7778.IBPluginDependency 7779.IBPluginDependency 7783.IBPluginDependency - 7794.IBPluginDependency 7795.IBPluginDependency 7796.IBPluginDependency 7798.IBPluginDependency @@ -24721,7 +24691,51 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7824.IBPluginDependency 7825.IBPluginDependency 7828.IBPluginDependency - 7831.IBPluginDependency + 7846.IBPluginDependency + 7846.IBViewBoundsToFrameTransform + 7847.IBPluginDependency + 7848.IBPluginDependency + 7848.IBViewBoundsToFrameTransform + 7849.IBPluginDependency + 7850.IBAttributePlaceholdersKey + 7850.IBPluginDependency + 7850.IBViewBoundsToFrameTransform + 7851.IBPluginDependency + 7859.IBPluginDependency + 7859.IBViewBoundsToFrameTransform + 7860.IBPluginDependency + 7861.IBEditorWindowLastContentRect + 7861.IBPluginDependency + 7862.IBPluginDependency + 7917.IBAttributePlaceholdersKey + 7917.IBPluginDependency + 7918.IBAttributePlaceholdersKey + 7918.IBPluginDependency + 7919.IBPluginDependency + 7920.IBAttributePlaceholdersKey + 7920.IBPluginDependency + 7921.IBAttributePlaceholdersKey + 7921.IBPluginDependency + 7922.IBPluginDependency + 7923.IBPluginDependency + 7924.IBPluginDependency + 7925.IBPluginDependency + 7926.IBPluginDependency + 7927.IBPluginDependency + 7928.IBPluginDependency + 7929.IBEditorWindowLastContentRect + 7929.IBPluginDependency + 7930.IBPluginDependency + 7931.IBPluginDependency + 7932.IBPluginDependency + 7954.IBAttributePlaceholdersKey + 7954.IBPluginDependency + 7954.IBViewBoundsToFrameTransform + 7955.IBPluginDependency + 7959.IBAttributePlaceholdersKey + 7959.IBPluginDependency + 7959.IBViewBoundsToFrameTransform + 7960.IBPluginDependency 858.IBPluginDependency 858.ImportedFromIB2 959.IBEditorWindowLastContentRect @@ -24860,6 +24874,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDJgAAwdgAAA + com.apple.InterfaceBuilder.CocoaPlugin @@ -25152,6 +25169,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABAwAAAwgQAAA + ToolTip @@ -25180,6 +25200,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUMjAABBMAAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25557,79 +25580,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit - - ToolTip - - ToolTip - - Add new table - - - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit - {{108, 78}, {208, 196}} - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit - - ToolTip - - ToolTip - - Refresh table list - - - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit - - ToolTip - - ToolTip - - Toggle the visibility of the Information panel - - - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit - - ToolTip - - ToolTip - - Rename the selected item - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Duplicate the selected item - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Delete all records of selected table(s) - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Remove the selected item(s) - - - com.apple.InterfaceBuilder.CocoaPlugin - com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit {{517, 426}, {241, 203}} com.apple.InterfaceBuilder.CocoaPlugin @@ -26063,8 +26013,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin {{513, 443}, {379, 154}} com.apple.InterfaceBuilder.CocoaPlugin {{513, 443}, {379, 154}} @@ -26132,7 +26080,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{41, 207}, {943, 549}} + {{41, 307}, {943, 549}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26143,13 +26091,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{316, 79}, {157, 63}} - 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.apple.InterfaceBuilder.CocoaPlugin @@ -26601,7 +26542,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26617,6 +26557,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + SPSplitView com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -26627,7 +26568,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin AUGwAABDagAAA @@ -26657,6 +26597,111 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUCgAABC6gAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + AUMRgABCkgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Add new table + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAAC/gAAAwbAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABC2AAAwqQAAA + + com.apple.InterfaceBuilder.CocoaPlugin + {{60, 127}, {208, 204}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Rename the selected item + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Duplicate the selected item + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Delete all records of selected table(s) + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Remove the selected item(s) + + + 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.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{316, 79}, {157, 63}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Refresh table list + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAAC/gAAAwbgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Toggle the visibility of the Information panel + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAAC/gAAAwbAAAA + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{265, 489}, {405, 267}} @@ -26695,7 +26740,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 7841 + 7964 @@ -28342,7 +28387,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 saveConnectionIncludeQuery saveConnectionSavePassword saveConnectionSavePasswordAlert - sidebarGrabber spHistoryControllerInstance statusTableAccessoryView statusTableCopyChecksum @@ -28417,7 +28461,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 id id id - id SPTableContent SPTableData id @@ -28487,7 +28530,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 saveConnectionIncludeQuery saveConnectionSavePassword saveConnectionSavePasswordAlert - sidebarGrabber spHistoryControllerInstance statusTableAccessoryView statusTableCopyChecksum @@ -28693,10 +28735,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 saveConnectionSavePasswordAlert id - - sidebarGrabber - id - spHistoryControllerInstance id @@ -33579,7 +33617,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES NSActionTemplate - NSAddTemplate NSAdvanced NSApplicationIcon NSGoLeftTemplate @@ -33588,11 +33625,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSListViewTemplate NSMenuCheckmark NSMenuMixedState - NSRefreshTemplate NSRightFacingTriangleTemplate NSSwitch button_action button_add + button_bar_handle button_bar_spacer button_duplicate button_edit @@ -33601,7 +33638,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 button_info_pane_show button_left button_pagination + button_pane_hide button_pane_hide_icon + button_pane_show button_pane_show_icon button_refresh button_remove @@ -33611,7 +33650,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES {10, 10} - {8, 8} {32, 32} {128, 128} {9, 9} @@ -33620,11 +33658,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {11, 10} {11, 11} {10, 3} - {10, 12} {9, 9} {15, 15} {32, 23} {32, 23} + {15, 23} {10, 23} {33, 23} {32, 23} @@ -33633,7 +33671,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {33, 23} {32, 23} {32, 23} + {32, 23} {11, 10} + {32, 23} {11, 10} {32, 23} {32, 23} diff --git a/Resources/Images/button_pane_hide.tiff b/Resources/Images/button_pane_hide.tiff new file mode 100644 index 00000000..a22a6419 Binary files /dev/null and b/Resources/Images/button_pane_hide.tiff differ diff --git a/Resources/Images/button_pane_show.tiff b/Resources/Images/button_pane_show.tiff new file mode 100644 index 00000000..fe3388d7 Binary files /dev/null and b/Resources/Images/button_pane_show.tiff differ diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h index 0dd389b8..1f5d16c7 100644 --- a/Source/SPDatabaseDocument.h +++ b/Source/SPDatabaseDocument.h @@ -31,7 +31,7 @@ @class SPConnectionController, #ifndef SP_REFACTOR /* class forward decls */ -SPProcessListController, SPServerVariablesController, SPUserManager, SPWindowController, +SPProcessListController, SPServerVariablesController, SPUserManager, SPWindowController, SPSplitView, #endif SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPServerSupport, SPCustomQuery, SPDatabaseStructure, SPMySQLConnection; @@ -123,8 +123,7 @@ SPDatabaseData, SPTablesList, SPTableStructure, SPTableContent, SPTableData, SPS IBOutlet NSTabView *tableTabView; IBOutlet NSTableView *tableInfoTable; - IBOutlet NSSplitView *contentViewSplitter; - IBOutlet id sidebarGrabber; + IBOutlet SPSplitView *contentViewSplitter; IBOutlet NSPopUpButton *encodingPopUp; #endif diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 0cfec364..059e784c 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -48,6 +48,7 @@ enum { #import "ImageAndTextCell.h" #import "SPGrowlController.h" #import "SPExportController.h" +#import "SPSplitView.h" #endif #import "SPQueryController.h" #import "SPQueryDocumentsController.h" @@ -273,6 +274,9 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; // Set up the toolbar [self setupToolbar]; + // Set collapsible behaviour on the table list so collapsing behaviour handles resize issus + [contentViewSplitter setCollapsibleSubviewIndex:0]; + // Set up the connection controller connectionController = [[SPConnectionController alloc] initWithDocument:self]; @@ -358,8 +362,6 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; [taskProgressWindow setAlphaValue:0.0f]; [taskProgressWindow setContentView:taskProgressLayer]; - [contentViewSplitter setDelegate:self]; - [self updateTitlebarStatusVisibilityForcingHide:NO]; #endif } @@ -5575,20 +5577,20 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; - (void)splitViewDidResizeSubviews:(NSNotification *)notification { - // Fix tablesList search field frame after collapsing the tablesList - [listFilterField setFrameSize:NSMakeSize([[[contentViewSplitter subviews] objectAtIndex:0] frame].size.width - 8, [listFilterField frame].size.height)]; - [self updateChooseDatabaseToolbarItemWidth]; - } -- (NSRect)splitView:(NSSplitView *)splitView additionalEffectiveRectOfDividerAtIndex:(NSInteger)dividerIndex +- (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMinimumPosition ofSubviewAt:(NSInteger)dividerIndex { - if (splitView == contentViewSplitter && sidebarGrabber != nil) { - return [sidebarGrabber splitView:splitView additionalEffectiveRectOfDividerAtIndex:dividerIndex]; - } else { - return NSZeroRect; + if (dividerIndex == 0 && proposedMinimumPosition < 40) { + return 40; } + return proposedMinimumPosition; +} + +- (CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMaximumPosition ofSubviewAt:(NSInteger)dividerIndex +{ + return proposedMaximumPosition; } - (void)updateChooseDatabaseToolbarItemWidth diff --git a/Source/SPSplitView.m b/Source/SPSplitView.m index 51e3eb79..8d25167e 100644 --- a/Source/SPSplitView.m +++ b/Source/SPSplitView.m @@ -92,7 +92,7 @@ - (void)awakeFromNib { - if ([super respondsToSelector:@selector(awakeFromNib)]) { + if ([NSSplitView instancesRespondToSelector:@selector(awakeFromNib)]) { [super awakeFromNib]; } @@ -598,6 +598,9 @@ if (additionalDragHandleView) { NSRect dragRect = [additionalDragHandleView frame]; dragRect.origin = [self convertPoint:dragRect.origin fromView:[additionalDragHandleView superview]]; + if ([additionalDragHandleView isFlipped] != [self isFlipped]) { + dragRect.origin.y -= dragRect.size.height; + } return dragRect; } @@ -761,7 +764,7 @@ if (i == collapsibleSubviewIndex && collapsibleSubviewCollapsed && !viewIsAnimating) { minSizes[i] = 0.f; maxSizes[i] = 0.f; - } else if (i == collapsibleSubviewIndex && !viewLength && animationTargetSize && [eachSubview isKindOfClass:[SPSplitViewHelperView class]]) { + } else if (i == collapsibleSubviewIndex && !viewLength && animationTargetSize && !viewIsAnimating && [eachSubview isKindOfClass:[SPSplitViewHelperView class]]) { minSizes[i] = animationTargetSize; maxSizes[i] = animationTargetSize; } else if (respectStruts && ![self _isViewResizable:eachSubview]) { @@ -778,6 +781,12 @@ // If this isn't the collapsible subview, or if there's no collapse animation, measure // the view and continue. if (!viewIsAnimating) { + + // Restore the original view if necessary + if ([eachSubview isKindOfClass:[SPSplitViewHelperView class]] && !collapsibleSubviewCollapsed && (viewLength || animationTargetSize)) { + [(SPSplitViewHelperView *)eachSubview restoreOriginalView]; + } + originalSizes[i] = viewLength; totalCurrentSize += viewLength; [outputSizes addObject:[NSNumber numberWithFloat:viewLength]]; diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 7b9b480e..73e7a844 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -336,6 +336,8 @@ 58DC10D312A1B8DF00B76DA5 /* SPMenuAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 58DC10D212A1B8DF00B76DA5 /* SPMenuAdditions.m */; }; 58DF9F3315AB26C2003B4330 /* SPDateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 58DF9F3215AB26C2003B4330 /* SPDateAdditions.m */; }; 58DF9F7315AB8509003B4330 /* SPSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 58DF9F7215AB8509003B4330 /* SPSplitView.m */; }; + 58DFB73C15BE16D7003B4330 /* button_pane_hide.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 58DFB73A15BE16D7003B4330 /* button_pane_hide.tiff */; }; + 58DFB73D15BE16D7003B4330 /* button_pane_show.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 58DFB73B15BE16D7003B4330 /* button_pane_show.tiff */; }; 58E205FC1234FE4F00A97059 /* KeyTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 58E205FB1234FE4F00A97059 /* KeyTemplate.pdf */; }; 58FEF16D0F23D66600518E8E /* SPSQLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 58FEF16C0F23D66600518E8E /* SPSQLParser.m */; }; 58FEF57E0F3B4E9700518E8E /* SPTableData.m in Sources */ = {isa = PBXBuildFile; fileRef = 58FEF57D0F3B4E9700518E8E /* SPTableData.m */; }; @@ -1119,6 +1121,8 @@ 58DF9F3215AB26C2003B4330 /* SPDateAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDateAdditions.m; sourceTree = ""; }; 58DF9F7115AB8509003B4330 /* SPSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPSplitView.h; sourceTree = ""; }; 58DF9F7215AB8509003B4330 /* SPSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPSplitView.m; sourceTree = ""; }; + 58DFB73A15BE16D7003B4330 /* button_pane_hide.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_pane_hide.tiff; sourceTree = ""; }; + 58DFB73B15BE16D7003B4330 /* button_pane_show.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_pane_show.tiff; sourceTree = ""; }; 58E205FB1234FE4F00A97059 /* KeyTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = KeyTemplate.pdf; sourceTree = ""; }; 58FEF16B0F23D66600518E8E /* SPSQLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPSQLParser.h; sourceTree = ""; }; 58FEF16C0F23D66600518E8E /* SPSQLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPSQLParser.m; sourceTree = ""; }; @@ -2102,7 +2106,9 @@ 58C3506410B9A56C00D37E14 /* button_left.png */, 58C3506A10B9AA8B00D37E14 /* button_pagination.png */, B5538AAC0FF251EE00219803 /* button_pane_hide_icon.tif */, + 58DFB73A15BE16D7003B4330 /* button_pane_hide.tiff */, B5538AAD0FF251EE00219803 /* button_pane_show_icon.tif */, + 58DFB73B15BE16D7003B4330 /* button_pane_show.tiff */, 58C3506610B9A57300D37E14 /* button_right.png */, 17E6418D0EF02036001BC333 /* clearconsole.tiff */, B577483A0F7A8B57003B34F9 /* database.png */, @@ -2973,6 +2979,8 @@ 58D1006513A57F940092E019 /* SaveSPFAccessory.strings in Resources */, 58D1006613A57F940092E019 /* SSHQuestionDialog.strings in Resources */, 58D1006713A57F940092E019 /* UserManagerView.strings in Resources */, + 58DFB73C15BE16D7003B4330 /* button_pane_hide.tiff in Resources */, + 58DFB73D15BE16D7003B4330 /* button_pane_show.tiff in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; -- cgit v1.2.3