From 6d5927b835706d28ee8ec24254d7b5c19bf6e5fe Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 3 Nov 2010 01:42:32 +0000 Subject: Add a new category to SPDatabaseDocument, allowing code cleanup and moving central functionality out of SPTablesList: - Centralise control over table loading, moving it away from SPTablesList and into SPDatabaseDocument and the new SPDatabaseViewController category - Centralise control over the main tab view, moving control away from SPTablesList and into SPDatabaseDocument and the new SPDatabaseViewController category - Simplify and clean up view loading logic - Improve thread safety - Update localisable strings --- Interfaces/English.lproj/DBView.xib | 223 +++++++++++++++++++----------------- 1 file changed, 117 insertions(+), 106 deletions(-) (limited to 'Interfaces/English.lproj/DBView.xib') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 3a32ac16..e8ba4357 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,12 +23,13 @@ YES + YES com.brandonwalkin.BWToolkit - com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.WebKitIBPlugin PluginDependencyRecalculationVersion @@ -46,7 +47,7 @@ NSApplication - + 274 YES @@ -221,7 +222,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -266,6 +267,7 @@ {{1, 1}, {218, 38}} + 6 @@ -297,6 +299,7 @@ {{-1, -13}, {220, 40}} + 2 @@ -394,6 +397,7 @@ {214, 354} + 4 @@ -421,6 +425,7 @@ {214, 354} + 528 @@ -556,6 +561,7 @@ {214, 145} + 6 @@ -583,6 +589,7 @@ {214, 145} + 512 @@ -1659,6 +1666,7 @@ {{1, 17}, {694, 289}} + 4 @@ -1692,6 +1700,7 @@ {{1, 0}, {694, 17}} + 4 @@ -1700,6 +1709,7 @@ {{-1, 22}, {696, 307}} + 562 @@ -2246,6 +2256,7 @@ {{1, 17}, {694, 140}} + 4 @@ -2278,6 +2289,7 @@ {{1, 0}, {694, 17}} + 4 @@ -2286,6 +2298,7 @@ {{-1, 23}, {696, 158}} + 562 @@ -6170,6 +6183,7 @@ {943, 549} + NSView @@ -6892,10 +6906,10 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} - + 256 YES @@ -6904,7 +6918,6 @@ 256 {{17, 74}, {272, 28}} - YES 67239424 @@ -6922,7 +6935,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 {{74, 45}, {162, 22}} - YES -2076049856 @@ -7004,7 +7016,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 {{154, 17}, {84, 28}} - 1 YES @@ -7028,7 +7039,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 {{72, 17}, {84, 28}} - YES 67239424 @@ -7047,12 +7057,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {306, 122} - - {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 7 @@ -7062,7 +7070,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Reset Auto Increment NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {255, 95} @@ -7225,7 +7233,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {255, 117} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -7235,7 +7243,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Relation NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 @@ -7836,7 +7844,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {302, 307} {{0, 0}, {1440, 878}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -7846,7 +7854,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Trigger NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {360, 348} @@ -8253,7 +8261,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {360, 370} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 3 @@ -8265,7 +8273,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 50} @@ -8385,7 +8393,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1920, 1178}} {213, 72} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -8397,7 +8405,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -8532,7 +8540,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 15 @@ -8544,7 +8552,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {350, 200} @@ -8767,7 +8775,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {350, 222} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPCreateSyntaxSheet @@ -8780,7 +8788,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -8950,7 +8958,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 31 @@ -8960,7 +8968,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 MySQL Help NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {351, 120} @@ -9358,7 +9366,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {351, 136} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} MYSQL_HELP_WINDOW @@ -9369,7 +9377,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Filter NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {380, 170} @@ -10014,7 +10022,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 778}} {380, 192} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPTableFilterPanel @@ -10514,7 +10522,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA Secure Text Input Sheet NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 @@ -10618,7 +10626,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA {338, 150} {{0, 0}, {1280, 778}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -10801,7 +10809,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA disabledControlTextColor 3 - MC4zMzMzMzMzNDMzAA + MC4zMzMzMzMzMzMzAA @@ -11788,22 +11796,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 587 - - - tabView - - - - 600 - - - - delegate - - - - 601 - tableDumpInstance @@ -16157,6 +16149,14 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7672 + + + delegate + + + + 7673 + @@ -25803,7 +25803,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - 7672 + 7673 @@ -27087,12 +27087,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA toggleNavigator: updateWindowTitle: validateSaveConnectionAccessory: - viewContent: - viewQuery: - viewRelations: - viewStatus: - viewStructure: - viewTriggers: YES @@ -27139,12 +27133,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id - id - id - id - id - id - id @@ -27194,12 +27182,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA toggleNavigator: updateWindowTitle: validateSaveConnectionAccessory: - viewContent: - viewQuery: - viewRelations: - viewStatus: - viewStructure: - viewTriggers: YES @@ -27375,30 +27357,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA validateSaveConnectionAccessory: id - - viewContent: - id - - - viewQuery: - id - - - viewRelations: - id - - - viewStatus: - id - - - viewStructure: - id - - - viewTriggers: - id - @@ -27900,6 +27858,73 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA Source/SPDatabaseDocument.h + + SPDatabaseDocument + + YES + + YES + viewContent: + viewQuery: + viewRelations: + viewStatus: + viewStructure: + viewTriggers: + + + YES + id + id + id + id + id + id + + + + YES + + YES + viewContent: + viewQuery: + viewRelations: + viewStatus: + viewStructure: + viewTriggers: + + + YES + + viewContent: + id + + + viewQuery: + id + + + viewRelations: + id + + + viewStatus: + id + + + viewStructure: + id + + + viewTriggers: + id + + + + + IBProjectSource + Source/SPDatabaseViewController.h + + SPDatabaseDocument @@ -30254,7 +30279,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA YES addField: - closeKeySheet: closeSheet: copyField: reloadTable: @@ -30275,7 +30299,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id - id @@ -30283,7 +30306,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA YES addField: - closeKeySheet: closeSheet: copyField: reloadTable: @@ -30299,10 +30321,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA addField: id - - closeKeySheet: - id - closeSheet: id @@ -30889,7 +30907,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA showCreateSyntaxContextMenuItem showCreateSyntaxMenuItem spHistoryControllerInstance - tabView tableContentInstance tableDataInstance tableDocumentInstance @@ -30941,7 +30958,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id - id NSButton id NSSplitView @@ -30986,7 +31002,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA showCreateSyntaxContextMenuItem showCreateSyntaxMenuItem spHistoryControllerInstance - tabView tableContentInstance tableDataInstance tableDocumentInstance @@ -31102,10 +31117,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA spHistoryControllerInstance SPHistoryController - - tabView - id - tableContentInstance id -- cgit v1.2.3