From 407aea899420ca2a6c1a0d3d80b89f70cb2cc74f Mon Sep 17 00:00:00 2001 From: Bibiko Date: Fri, 26 Jun 2009 09:06:36 +0000 Subject: =?UTF-8?q?=E2=80=A2=20fixes=20for=20Create=20Syntax=20HUD=20windo?= =?UTF-8?q?w:=20-=20added=20minimum=20size=20to=20avoid=20overlapping=20co?= =?UTF-8?q?ntext=20and=20header=20-=20now=20keyboard,=20mouse=20events=20a?= =?UTF-8?q?re=20working=20for=20scrolling=20-=20bound=20font=20to=20Custom?= =?UTF-8?q?QueryEditorFont=20=E2=80=A2=20removed=20tiny=20double=20code=20?= =?UTF-8?q?in=20TableDocument?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Interfaces/English.lproj/DBView.xib | 120 ++++++++++++++++++++++++++++-------- Source/TableDocument.m | 2 +- 2 files changed, 96 insertions(+), 26 deletions(-) diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index ab871a07..109a7b6c 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -8,7 +8,7 @@ 353.00 YES - + YES @@ -91,6 +91,7 @@ 4352 {212, 381} + YES @@ -187,6 +188,7 @@ {212, 381} + @@ -202,6 +204,7 @@ -2147483392 {{175, 1}, {15, 481}} + _doScroller: 9.979253e-01 @@ -211,6 +214,7 @@ 256 {{-100, -100}, {141, 11}} + 257 _doScroller: @@ -219,6 +223,7 @@ {212, 381} + 528 @@ -229,10 +234,12 @@ {212, 381} + {212, 381} + NSView @@ -255,6 +262,7 @@ 4352 {212, 145} + YES @@ -318,6 +326,7 @@ {212, 145} + @@ -328,6 +337,7 @@ -2147483392 {{-100, -100}, {15, 20}} + _doScroller: 9.473684e-01 @@ -337,6 +347,7 @@ 256 {{-100, -100}, {141, 11}} + 257 _doScroller: @@ -345,6 +356,7 @@ {212, 145} + 512 @@ -355,11 +367,13 @@ {{0, 382}, {212, 145}} + NSView {{0, 23}, {212, 527}} + 2 NO @@ -410,6 +424,7 @@ 268 {{-1, -1}, {32, 24}} + YES 67239424 @@ -434,6 +449,7 @@ 268 {{30, -1}, {32, 24}} + YES 71433792 @@ -543,6 +559,7 @@ 268 {{61, -1}, {32, 24}} + YES 67239424 @@ -567,6 +584,7 @@ 268 {{92, -1}, {32, 24}} + YES -2080244224 @@ -593,6 +611,7 @@ {212, 23} + YES YES NO @@ -601,6 +620,7 @@ {212, 550} + NSView @@ -613,6 +633,7 @@ 274 {{-7, -10}, {735, 564}} + YES @@ -2293,8 +2314,8 @@ YES YES - . - , + , + . NO YES NO @@ -3993,12 +4014,14 @@ 4352 {688, 454} + YES 256 {688, 17} + @@ -4006,6 +4029,7 @@ -2147483392 {{-26, 0}, {16, 17}} + YES @@ -4189,6 +4213,7 @@ {{1, 17}, {688, 454}} + @@ -4199,6 +4224,7 @@ -2147483392 {{674, 17}, {15, 453}} + _doScroller: 9.679487e-01 @@ -4208,6 +4234,7 @@ -2147483392 {{1, 470}, {688, 15}} + 1 _doScroller: @@ -4222,6 +4249,7 @@ {{1, 0}, {688, 17}} + @@ -4231,6 +4259,7 @@ {{6, 32}, {690, 472}} + 562 @@ -4245,6 +4274,7 @@ 292 {{6, 9}, {32, 25}} + YES -1543373312 @@ -4266,6 +4296,7 @@ 292 {{68, 9}, {32, 25}} + YES -2080244224 @@ -4287,6 +4318,7 @@ 292 {{37, 9}, {32, 25}} + YES -1543373312 @@ -4320,6 +4352,7 @@ {{100, 10}, {596, 23}} + YES 130560 @@ -4337,6 +4370,7 @@ 268 {{14, 515}, {347, 14}} + YES 68288064 @@ -4351,6 +4385,7 @@ {{10, 7}, {700, 544}} + Relations @@ -4370,17 +4405,20 @@ {{221, 0}, {723, 550}} + NSView {944, 550} + YES DBViewSplitter {944, 550} + {{0, 0}, {1920, 1178}} {780, 502} @@ -8894,23 +8932,24 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {3.40282e+38, 3.40282e+38} - 8223 + 8219 2 - {{196, 190}, {580, 320}} - -469762048 + {{196, 348}, {280, 162}} + -469761024 Create Table Syntax NSPanel {3.40282e+38, 3.40282e+38} + {120, 100} - + 256 YES 289 - {{480, -1}, {81, 27}} + {{180, -1}, {81, 27}} YES @@ -8929,7 +8968,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 274 + 4370 YES @@ -8939,8 +8978,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - 2322 - {566, 72} + 6418 + {266, 144} @@ -9143,11 +9182,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 5.660000e+02 + 2.660000e+02 1 - 10983 + 2049 @@ -9179,13 +9218,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 6 + 7 {1144, 1e+07} - {228, 0} + {86, 0} - {566, 279} + {266, 121} @@ -9196,12 +9235,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 - {{566, 0}, {12, 279}} + {{266, 0}, {12, 121}} + YES 2 _doScroller: - 8.870056e-01 + 8.402778e-01 @@ -9215,18 +9255,20 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 9.456522e-01 - {{1, 34}, {578, 279}} + {{1, 34}, {278, 121}} - 16 + 592 - {580, 320} + {280, 162} + {{0, 0}, {1440, 878}} + {120, 119} {3.40282e+38, 3.40282e+38} createTableSyntaxWindow @@ -12542,6 +12584,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSView + + YES + CustomQueryEditorFont + YES @@ -16438,6 +16484,26 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6206 + + + font: values.CustomQueryEditorFont + + + + + + font: values.CustomQueryEditorFont + font + values.CustomQueryEditorFont + + NSValueTransformerName + NSUnarchiveFromData + + 2 + + + 6208 + @@ -23796,7 +23862,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 3987.NSWindowTemplate.visibleAtLaunch 3987.editorWindowContentRectSynchronizationRect 3987.windowTemplate.hasMaxSize + 3987.windowTemplate.hasMinSize 3987.windowTemplate.maxSize + 3987.windowTemplate.minSize 3988.IBPluginDependency 3994.IBEditorWindowLastContentRect 3994.IBPluginDependency @@ -25503,12 +25571,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{172, 464}, {580, 320}} - {{172, 464}, {580, 320}} + {{172, 622}, {280, 162}} + {{172, 622}, {280, 162}} {{115, 214}, {588, 350}} + {3.40282e+38, 3.40282e+38} + {120, 100} com.apple.InterfaceBuilder.CocoaPlugin {{412, 275}, {200, 32}} com.apple.InterfaceBuilder.CocoaPlugin @@ -25800,7 +25870,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{697, 485}, {260, 127}} {{697, 485}, {260, 127}} - + {600, 127} {260, 127} @@ -26797,7 +26867,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 6206 + 6208 diff --git a/Source/TableDocument.m b/Source/TableDocument.m index d710caa1..9f1b0fa9 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -1308,11 +1308,11 @@ NSString *TableDocumentFavoritesControllerSelectionIndexDidChange = @"TableDocum if ([tableSyntax isKindOfClass:[NSData class]]) tableSyntax = [[NSString alloc] initWithData:tableSyntax encoding:[mySQLConnection encoding]]; - [syntaxViewContent setEditable:YES]; if([tablesListInstance tableType] == SP_TABLETYPE_VIEW) [syntaxViewContent setString:[tableSyntax createViewSyntaxPrettifier]]; else [syntaxViewContent setString:tableSyntax]; + [syntaxViewContent setEditable:NO]; [createTableSyntaxWindow setTitle:createWindowTitle]; -- cgit v1.2.3