From 0234a711d310934d4b7db541cf9af0e33e5b18c2 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Wed, 19 Jan 2011 22:06:12 +0000 Subject: =?UTF-8?q?=E2=80=A2=20bound=20showFilterTable=20to=20main=20menu'?= =?UTF-8?q?s=20Edit=20>=20Find=20>=20Find=E2=80=A6=20menu=20item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Interfaces/English.lproj/DBView.xib | 126 ++++++++++-------------------------- Source/SPCopyTable.m | 11 ++++ 2 files changed, 45 insertions(+), 92 deletions(-) diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index c7394460..cee5f9ce 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -3,7 +3,7 @@ 1050 10J567 - 804 + 788 1038.35 462.00 @@ -16,9 +16,9 @@ YES - 804 - 804 - 1.2.2 + 788 + 788 + 1.2.5 @@ -29,8 +29,8 @@ YES com.brandonwalkin.BWToolkit - com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin + com.apple.InterfaceBuilder.CocoaPlugin PluginDependencyRecalculationVersion @@ -509,7 +509,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -2095,6 +2095,7 @@ NO NO NO + NO 0.0 0.0 @@ -2938,30 +2939,6 @@ 75 - - - 265 - {{734, 507}, {160, 16}} - - YES - - 67239424 - 134479872 - ShowFilterTable_Dummy_Button - - LucidaGrande - 9 - 3614 - - - -2038284033 - 268435585 - - f - 200 - 25 - - 266 @@ -6516,7 +6493,7 @@ {311, 112} {311, 112} - + 256 YES @@ -6525,7 +6502,6 @@ 256 {{5, 75}, {134, 14}} - YES 68288064 @@ -6542,7 +6518,6 @@ 256 {{5, 50}, {134, 14}} - YES 68288064 @@ -6559,7 +6534,6 @@ 258 {{146, 74}, {145, 18}} - YES -1804468671 @@ -6582,7 +6556,6 @@ 259 {{215, 13}, {80, 28}} - 1 YES @@ -6610,7 +6583,6 @@ 259 {{131, 13}, {86, 28}} - YES 67239424 @@ -6632,7 +6604,6 @@ 258 {{143, 45}, {151, 22}} - YES -2076049856 @@ -6665,8 +6636,6 @@ {311, 112} - - {{0, 0}, {1440, 878}} {311, 134} @@ -7231,7 +7200,7 @@ View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -7376,7 +7345,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 7 @@ -7386,7 +7355,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Reset Auto Increment NSWindow - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {255, 95} @@ -7510,8 +7479,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES YES - , - . + . + , NO YES NO @@ -7549,7 +7518,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {255, 117} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 1 @@ -7559,7 +7528,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Relation NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -8160,7 +8129,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {302, 307} {{0, 0}, {1440, 878}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -8170,7 +8139,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Trigger NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {360, 348} @@ -8577,7 +8546,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {360, 370} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 3 @@ -8589,7 +8558,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 50} @@ -8709,7 +8678,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1920, 1178}} {213, 72} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -8721,7 +8690,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -8856,7 +8825,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 15 @@ -8868,7 +8837,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {350, 200} @@ -9091,7 +9060,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {350, 222} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} SPCreateSyntaxSheet @@ -9104,7 +9073,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -9274,7 +9243,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 31 @@ -9284,7 +9253,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 MySQL Help NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {351, 120} @@ -9682,7 +9651,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {351, 136} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} MYSQL_HELP_WINDOW @@ -9693,7 +9662,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Filter NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {380, 170} @@ -10335,7 +10304,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 778}} {380, 192} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} SPTableFilterPanel @@ -10835,7 +10804,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA Secure Text Input Sheet NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -10939,7 +10908,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA {338, 150} {{0, 0}, {1280, 778}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -11123,7 +11092,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA disabledControlTextColor 3 - MC4zMzMzMzMzMzMzAA + MC4zMzMzMzMzNDMzAA @@ -16271,14 +16240,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7581 - - - showFilterTable: - - - - 7586 - filterTableLiveSearchCheckbox @@ -20123,7 +20084,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - @@ -20244,20 +20204,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - - 7533 - - - YES - - - - - - 7534 - - - 5181 @@ -24388,8 +24334,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7523.IBPluginDependency 7524.IBPluginDependency 7525.IBPluginDependency - 7533.IBPluginDependency - 7534.IBPluginDependency 7537.IBAttributePlaceholdersKey 7537.IBPluginDependency 7538.IBPluginDependency @@ -25811,7 +25755,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{455, 297}, {943, 549}} + {{337, 207}, {943, 549}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26167,8 +26111,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin ToolTip diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m index d31ae09d..3b84d867 100644 --- a/Source/SPCopyTable.m +++ b/Source/SPCopyTable.m @@ -934,6 +934,10 @@ NSInteger kBlobAsImageFile = 4; { NSInteger menuItemTag = [anItem tag]; + if ([anItem action] == @selector(performFindPanelAction:)) { + return (menuItemTag == 1 && [[self delegate] isKindOfClass:[SPTableContent class]]); + } + // Don't validate anything other than the copy commands if (menuItemTag != MENU_EDIT_COPY && menuItemTag != MENU_EDIT_COPY_WITH_COLUMN && menuItemTag != MENU_EDIT_COPY_AS_SQL) { return YES; @@ -1095,6 +1099,13 @@ NSInteger kBlobAsImageFile = 4; [super keyDown:theEvent]; } +- (void)performFindPanelAction:(id)sender +{ + if([sender tag] == 1 && [[self delegate] isKindOfClass:[SPTableContent class]]) { + [[self delegate] showFilterTable:self]; + } +} + #pragma mark - #pragma mark Bundle Command Support -- cgit v1.2.3