From 7b69d7481a828f4466335dd988da5ee3bc35af33 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 4 Sep 2011 13:30:26 +0000 Subject: Fix for issue 1168. Whenever the database is changed load all of the currently used relation names in a backgroud thread. In the event that the user opens the add new relation sheet during this process, the ability to enter a relation name and confirm the addition is disabled until the retrieval process is complete. There is also a new progress indicator on the add sheet to indicate this. --- Interfaces/English.lproj/DBView.xib | 261 ++++++++++++++++++++++-------------- 1 file changed, 162 insertions(+), 99 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index a161dc5f..e4e83820 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,7 +2,7 @@ 1050 - 10K540 + 10K549 851 1038.36 461.00 @@ -23,17 +23,13 @@ YES - - - - YES com.brandonwalkin.BWToolkit - com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin + com.apple.InterfaceBuilder.CocoaPlugin PluginDependencyRecalculationVersion @@ -51,7 +47,7 @@ NSApplication - + 274 YES @@ -524,7 +520,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -569,7 +565,6 @@ {{1, 1}, {218, 38}} - 6 @@ -601,7 +596,6 @@ {{-1, -13}, {220, 40}} - 2 @@ -699,7 +693,6 @@ {214, 352} - 4 @@ -727,7 +720,6 @@ {214, 352} - 528 @@ -863,7 +855,6 @@ {216, 145} - 6 @@ -890,7 +881,6 @@ {{-1, 0}, {216, 145}} - 528 @@ -978,7 +968,6 @@ {214, 145} - 6 @@ -1006,7 +995,6 @@ {214, 145} - 512 @@ -4761,7 +4749,6 @@ {{1, 1}, {541, 70}} - @@ -4792,7 +4779,6 @@ {{109, 0}, {554, 72}} - 18 @@ -4900,7 +4886,6 @@ {{1, 1}, {541, 197}} - @@ -4930,7 +4915,6 @@ {{109, 0}, {554, 199}} - 18 @@ -5299,8 +5283,8 @@ YES YES - , - . + . + , YES YES YES @@ -6509,7 +6493,6 @@ {943, 549} - NSView @@ -6695,6 +6678,7 @@ 256 {{104, 98}, {258, 14}} + YES 68288064 @@ -6711,6 +6695,7 @@ 258 {{107, 72}, {252, 18}} + YES -1804468671 @@ -6728,6 +6713,7 @@ 259 {{263, 13}, {101, 28}} + 1 YES @@ -6751,6 +6737,7 @@ 259 {{172, 13}, {93, 28}} + YES 67239424 @@ -6772,6 +6759,7 @@ 268 {{105, 48}, {256, 18}} + YES 67239424 @@ -6794,6 +6782,7 @@ 268 {{-3, 98}, {105, 14}} + YES 68288064 @@ -6810,6 +6799,7 @@ 268 {{-3, 74}, {105, 14}} + YES 68288064 @@ -6826,6 +6816,7 @@ 268 {{104, 120}, {258, 14}} + YES 68288064 @@ -6840,6 +6831,7 @@ {379, 154} + {{0, 0}, {1280, 778}} {379, 176} @@ -7281,7 +7273,7 @@ View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -7426,7 +7418,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 7 @@ -7436,7 +7428,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Reset Auto Increment NSWindow - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {255, 95} @@ -7560,8 +7552,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES YES - , - . + . + , NO YES NO @@ -7599,17 +7591,17 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {255, 117} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 1 2 - {{196, 141}, {337, 369}} + {{196, 141}, {379, 369}} 1946157056 New Relation NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -7707,11 +7699,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {301, 40}} + {{1, 1}, {343, 40}} - {{17, 231}, {303, 56}} + {{17, 231}, {345, 56}} {0, 0} @@ -7776,17 +7768,17 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {301, 42}} + {{1, 1}, {343, 42}} - {{17, 291}, {303, 58}} + {{17, 291}, {345, 58}} {0, 0} 67239424 0 - Name: + Name @@ -8021,11 +8013,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {301, 71}} + {{1, 1}, {343, 71}} - {{17, 49}, {303, 87}} + {{17, 49}, {345, 87}} {0, 0} @@ -8218,11 +8210,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {301, 71}} + {{1, 1}, {343, 71}} - {{17, 140}, {303, 87}} + {{17, 140}, {345, 87}} {0, 0} @@ -8245,7 +8237,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{226, 13}, {96, 28}} + {{268, 13}, {96, 28}} 1 YES @@ -8266,7 +8258,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{132, 13}, {96, 28}} + {{174, 13}, {96, 28}} YES @@ -8283,12 +8275,37 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 25 + + + -2147482332 + + {{20, 20}, {16, 16}} + + 28938 + 100 + + + + -2147483356 + {{41, 21}, {133, 14}} + + YES + + 68288064 + 272761856 + Retrieving data... + + + + + + - {337, 369} + {379, 369} {{0, 0}, {1440, 878}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -8298,7 +8315,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Trigger NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {360, 348} @@ -8705,7 +8722,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {360, 370} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 3 @@ -8717,7 +8734,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 50} @@ -8837,7 +8854,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1920, 1178}} {213, 72} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -8849,7 +8866,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -8984,7 +9001,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 15 @@ -8996,7 +9013,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {350, 200} @@ -9219,7 +9236,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {350, 222} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} SPCreateSyntaxSheet @@ -9232,7 +9249,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -9402,7 +9419,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 31 @@ -9412,7 +9429,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 MySQL Help NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {351, 120} @@ -9810,7 +9827,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {351, 136} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} MYSQL_HELP_WINDOW @@ -9821,10 +9838,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Filter NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {380, 170} - + 274 YES @@ -9901,7 +9918,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {478, 53}} - 4 @@ -9933,7 +9949,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {480, 55} - 65 @@ -10072,7 +10087,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 17}, {480, 87}} - 4 @@ -10108,7 +10122,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 0}, {480, 17}} - 4 @@ -10117,7 +10130,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {482, 105} - 562 @@ -10149,29 +10161,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 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 - 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 - - {480, 14} @@ -10237,7 +10226,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {480, 106}} - @@ -10267,7 +10255,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {482, 108} - 562 @@ -10484,11 +10471,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {480, 269} - {{0, 0}, {1280, 778}} {380, 192} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} SPTableFilterPanel @@ -10502,7 +10488,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {251, 102} {251, 102} - + 256 YES @@ -10660,7 +10646,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {251, 102} - {{0, 0}, {1920, 1058}} {251, 124} @@ -10797,7 +10782,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Secure Text Input Sheet NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -10901,7 +10886,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {338, 150} {{0, 0}, {1280, 778}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -11084,7 +11069,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 disabledControlTextColor 3 - MC4zMzMzMzMzMzMzAA + MC4zMzMzMzMzNDMzAA @@ -16612,6 +16597,22 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7816 + + + progressStatusTextField + + + + 7826 + + + + dataProgressIndicator + + + + 7827 + @@ -17548,6 +17549,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + @@ -23273,6 +23276,25 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 7823 + + + + + 7824 + + + YES + + + + + + 7825 + + + @@ -24639,6 +24661,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7821.IBPluginDependency 7821.IBViewBoundsToFrameTransform 7822.IBPluginDependency + 7823.IBPluginDependency + 7824.IBPluginDependency + 7825.IBPluginDependency 858.IBPluginDependency 858.ImportedFromIB2 959.IBEditorWindowLastContentRect @@ -25239,9 +25264,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{495, 136}, {337, 369}} + {{340, 487}, {379, 369}} com.apple.InterfaceBuilder.CocoaPlugin - {{495, 136}, {337, 369}} + {{340, 487}, {379, 369}} com.apple.InterfaceBuilder.CocoaPlugin @@ -26041,7 +26066,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{329, 100}, {943, 549}} + {{81, 100}, {943, 549}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26562,6 +26587,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{265, 489}, {405, 267}} com.apple.InterfaceBuilder.CocoaPlugin @@ -26599,7 +26627,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 7822 + 7827 @@ -30160,6 +30188,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Source/SPProcessListController.h + + SPQueryController + + IBProjectSource + Source/SPQueryConsoleDataSource.h + + SPQueryController NSWindowController @@ -30316,6 +30351,20 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Source/SPQueryController.h + + SPQueryController + + IBProjectSource + Source/SPQueryControllerInitializer.h + + + + SPQueryController + + IBProjectSource + Source/SPQueryDocumentsController.h + + SPServerVariablesController NSWindowController @@ -31082,9 +31131,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 columnPopUpButton confirmAddRelationButton constraintName + dataProgressIndicator labelTextField onDeletePopUpButton onUpdatePopUpButton + progressStatusTextField refColumnPopUpButton refTablePopUpButton refreshRelationsButton @@ -31103,9 +31154,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSPopUpButton NSButton NSTextField + NSProgressIndicator NSTextField NSPopUpButton NSPopUpButton + NSTextField NSPopUpButton NSPopUpButton NSButton @@ -31127,9 +31180,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 columnPopUpButton confirmAddRelationButton constraintName + dataProgressIndicator labelTextField onDeletePopUpButton onUpdatePopUpButton + progressStatusTextField refColumnPopUpButton refTablePopUpButton refreshRelationsButton @@ -31166,6 +31221,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 constraintName NSTextField + + dataProgressIndicator + NSProgressIndicator + labelTextField NSTextField @@ -31178,6 +31237,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 onUpdatePopUpButton NSPopUpButton + + progressStatusTextField + NSTextField + refColumnPopUpButton NSPopUpButton -- cgit v1.2.3