From cbd1596361f53edfdceba8af0461667afa54a417 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sat, 6 Feb 2010 18:43:20 +0000 Subject: - Trigger a full table reload when the table type is changed; makes relations etc immeadiately available on changes to InnoDB, and updates a number of status variables --- Interfaces/English.lproj/DBView.xib | 103 +++++++++++++++++++----------------- Source/SPExtendedTableInfo.h | 3 +- Source/SPExtendedTableInfo.m | 3 +- 3 files changed, 58 insertions(+), 51 deletions(-) diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 0778dfd4..86adcc8e 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -18,7 +18,7 @@ YES 740 740 - 1.2.2 + 1.2.5 @@ -28,8 +28,8 @@ YES com.brandonwalkin.BWToolkit - com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.WebKitIBPlugin YES @@ -59,7 +59,7 @@ Sequel Pro NSWindow View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {780, 480} @@ -237,7 +237,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -282,6 +282,7 @@ {{1, 1}, {218, 38}} + 6 @@ -313,6 +314,7 @@ {{-1, -13}, {220.212, 40}} + 2 @@ -410,6 +412,7 @@ {214, 354} + 4 @@ -437,6 +440,7 @@ {214, 354} + 528 @@ -572,6 +576,7 @@ {214, 145} + 6 @@ -599,6 +604,7 @@ {214, 145} + 512 @@ -1687,6 +1693,7 @@ NO NO NO + NO 0.0 0.0 @@ -2972,6 +2979,7 @@ {{1, 1}, {694, 155}} + @@ -3003,6 +3011,7 @@ {696, 157} + 530 @@ -3092,6 +3101,7 @@ {{1, 17}, {694, 228}} + 4 @@ -3125,6 +3135,7 @@ {{1, 0}, {694, 17}} + 4 @@ -3133,6 +3144,7 @@ {696, 246} + 562 @@ -5300,7 +5312,7 @@ {{0, 0}, {1920, 1178}} {780, 502} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -6375,7 +6387,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -6655,7 +6667,7 @@ {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -6667,7 +6679,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -6823,7 +6835,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -6833,7 +6845,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Relation NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 @@ -7434,7 +7446,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {302, 307} {{0, 0}, {1440, 878}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -7444,9 +7456,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Trigger NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} - + 256 YES @@ -7465,7 +7477,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{49, 66}, {39, 14}} - YES 68288064 @@ -7482,7 +7493,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{94, 64}, {181, 19}} - YES -1804468671 @@ -7500,7 +7510,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{91, 35}, {187, 22}} - YES -2076049856 @@ -7555,7 +7564,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{91, 10}, {187, 22}} - YES -2076049856 @@ -7621,7 +7629,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{15, 40}, {72, 14}} - YES 68288064 @@ -7638,7 +7645,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{51, 15}, {36, 14}} - YES 68288064 @@ -7653,12 +7659,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {293, 93}} - {{17, 219}, {295, 109}} - {0, 0} 67239424 @@ -7682,7 +7686,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{218, 13}, {96, 28}} - 1 YES @@ -7704,7 +7707,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{124, 13}, {96, 28}} - YES 67239424 @@ -7758,7 +7760,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {287, 14} - @@ -7820,7 +7821,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {287, 168}} - @@ -7832,7 +7832,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 -2147483392 {{-100, -100}, {11, 133}} - 256 _doScroller: @@ -7843,7 +7842,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 -2147483392 {{-100, -100}, {87, 18}} - 1 _doScroller: @@ -7853,7 +7851,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{20, 45}, {289, 170}} - 530 @@ -7862,11 +7859,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {329, 348} - - {{0, 0}, {1680, 1028}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 3 @@ -7878,7 +7873,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 50} @@ -7998,7 +7993,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1920, 1178}} {213, 72} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -8010,7 +8005,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -8145,7 +8140,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 15 @@ -8157,7 +8152,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {350, 200} @@ -8359,7 +8354,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {350, 222} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -8371,7 +8366,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -8520,7 +8515,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 31 @@ -8530,7 +8525,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 MySQL Help NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {351, 120} @@ -8924,7 +8919,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {351, 136} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} MYSQL_HELP_WINDOW @@ -8937,7 +8932,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {350, 250} @@ -9328,7 +9323,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1920, 1178}} {350, 272} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -9461,7 +9456,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Secure Text Input Sheet NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 @@ -9565,7 +9560,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {338, 138} {{0, 0}, {1280, 778}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -11431,7 +11426,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 disabledControlTextColor 3 - MC4zMzMzMzMzNDMzAA + MC4zMzMzMzMzMzMzAA @@ -15750,6 +15745,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6810 + + + tablesListInstance + + + + 6812 + @@ -24479,10 +24482,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{95, 382}, {944, 550}} + {{95, 306}, {944, 550}} com.apple.InterfaceBuilder.CocoaPlugin - {{95, 382}, {944, 550}} + {{95, 306}, {944, 550}} {{62, 352}, {845, 504}} @@ -25733,7 +25736,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 6810 + 6812 @@ -26269,6 +26272,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 tableSizeFree tableTypePopUpButton tableUpdatedAt + tablesListInstance YES @@ -26290,6 +26294,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSTextField NSPopUpButton NSTextField + TablesList diff --git a/Source/SPExtendedTableInfo.h b/Source/SPExtendedTableInfo.h index bcb69e50..a3f12c62 100644 --- a/Source/SPExtendedTableInfo.h +++ b/Source/SPExtendedTableInfo.h @@ -26,11 +26,12 @@ #import #import -@class SPTableData, SPDatabaseData; +@class SPTableData, SPDatabaseData, TablesList; @interface SPExtendedTableInfo : NSObject { IBOutlet id tableDocumentInstance; + IBOutlet TablesList *tablesListInstance; IBOutlet SPTableData *tableDataInstance; IBOutlet SPDatabaseData *databaseDataInstance; diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m index 88c91981..1ddcc90d 100644 --- a/Source/SPExtendedTableInfo.m +++ b/Source/SPExtendedTableInfo.m @@ -30,6 +30,7 @@ #import "SPStringAdditions.h" #import "SPConstants.h" #import "TableDocument.h" +#import "TablesList.h" #import "SPAlertSheets.h" @interface SPExtendedTableInfo (PrivateAPI) @@ -102,7 +103,7 @@ if ([connection getLastErrorID] == 0) { // Reload the table's data - [self reloadTable:self]; + [tablesListInstance updateSelectionWithTaskString:NSLocalizedString(@"Reloading data...", @"Reloading data task description")]; } else { [sender selectItemWithTitle:currentType]; -- cgit v1.2.3