From 10c3673a3a63f2a7a610f9f474a1d4b45c44a9f6 Mon Sep 17 00:00:00 2001 From: dmoagx Date: Mon, 4 Jul 2011 20:05:25 +0000 Subject: * Fixes a spacing issue and an issue where MySQL keywords could be translated (fixes #1105) * Adds support for naming relations (fixes #948, #1085) --- Interfaces/English.lproj/DBView.xib | 255 +++++++++++++++++++++++++++++------- 1 file changed, 210 insertions(+), 45 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 20f7a9bd..7f7fe455 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,9 +2,9 @@ 1050 - 10J869 + 10K540 851 - 1038.35 + 1038.36 461.00 YES @@ -23,6 +23,7 @@ YES + YES @@ -7488,8 +7489,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES YES - . - , + , + . NO YES NO @@ -7532,14 +7533,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1 2 - {{196, 203}, {302, 307}} + {{196, 141}, {337, 369}} 1946157056 New Relation NSPanel {1.79769e+308, 1.79769e+308} - + 256 YES @@ -7556,7 +7557,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{80, 10}, {171, 22}} + {{115, 10}, {171, 22}} YES @@ -7621,12 +7622,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{29, 15}, {49, 14}} + {{15, 15}, {98, 14}} YES 68288064 - 4326400 + 71435264 Column: @@ -7635,11 +7636,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {266, 40}} + {{1, 1}, {301, 40}} - {{17, 231}, {268, 56}} + {{17, 231}, {303, 56}} {0, 0} @@ -7659,6 +7660,75 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2 NO + + + 12 + + YES + + + 256 + + YES + + + 268 + {{15, 17}, {98, 14}} + + YES + + 68288064 + 71435264 + Name: + + + + + + + + + 268 + {{118, 14}, {165, 19}} + + YES + + -1804468671 + 272761856 + + + Generate one + + YES + + + + + + {{1, 1}, {301, 42}} + + + + {{17, 291}, {303, 58}} + + {0, 0} + + 67239424 + 0 + Name: + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 1 + 0 + 2 + NO + 12 @@ -7672,7 +7742,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{81, 40}, {170, 22}} + {{116, 40}, {170, 22}} YES @@ -7696,6 +7766,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _popUpItemAction: + -1 YES @@ -7723,6 +7794,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _popUpItemAction: + 1 @@ -7734,6 +7806,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _popUpItemAction: + 2 @@ -7744,6 +7817,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _popUpItemAction: + 3 @@ -7757,7 +7831,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{81, 10}, {170, 22}} + {{116, 10}, {170, 22}} YES @@ -7781,6 +7855,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _popUpItemAction: + -1 YES @@ -7809,6 +7884,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _popUpItemAction: + 1 @@ -7819,6 +7895,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _popUpItemAction: + 2 @@ -7829,6 +7906,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _popUpItemAction: + 3 @@ -7842,12 +7920,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{15, 45}, {64, 14}} + {{15, 45}, {99, 14}} YES 68288064 - 4326400 + 71435264 On update: @@ -7858,12 +7936,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{19, 15}, {59, 14}} + {{15, 15}, {98, 14}} YES 68288064 - 4326400 + 71435264 On delete: @@ -7872,11 +7950,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {266, 71}} + {{1, 1}, {301, 71}} - {{17, 49}, {268, 87}} + {{17, 49}, {303, 87}} {0, 0} @@ -7909,7 +7987,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{80, 40}, {171, 22}} + {{115, 40}, {171, 22}} YES @@ -7974,7 +8052,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{80, 10}, {171, 22}} + {{115, 10}, {171, 22}} YES @@ -8039,12 +8117,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{41, 45}, {37, 14}} + {{15, 45}, {98, 14}} YES 68288064 - 4326400 + 71435264 Table: @@ -8055,12 +8133,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{29, 15}, {49, 14}} + {{15, 15}, {98, 14}} YES 68288064 - 4326400 + 71435264 Column: @@ -8069,11 +8147,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {266, 71}} + {{1, 1}, {301, 71}} - {{17, 140}, {268, 87}} + {{17, 140}, {303, 87}} {0, 0} @@ -8096,7 +8174,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{191, 13}, {96, 28}} + {{226, 13}, {96, 28}} 1 YES @@ -8117,7 +8195,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{97, 13}, {96, 28}} + {{132, 13}, {96, 28}} YES @@ -8135,7 +8213,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {302, 307} + {337, 369} + {{0, 0}, {1440, 878}} {1.79769e+308, 1.79769e+308} @@ -16604,6 +16683,22 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7797 + + + constraintName + + + + 7812 + + + + delegate + + + + 7813 + @@ -17534,6 +17629,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA YES + @@ -23193,6 +23289,44 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + 7798 + + + YES + + + + + + + 7800 + + + YES + + + + + + 7801 + + + + + 7808 + + + YES + + + + + + 7809 + + + @@ -23635,8 +23769,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 5597.IBPluginDependency 5597.IBUserGuides 5599.IBPluginDependency + 5599.IBViewBoundsToFrameTransform 5600.IBPluginDependency 5601.IBPluginDependency + 5601.IBViewBoundsToFrameTransform 5602.IBPluginDependency 5606.IBPluginDependency 5607.IBPluginDependency @@ -23687,6 +23823,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 565.windowTemplate.maxSize 565.windowTemplate.minSize 5652.IBPluginDependency + 5652.IBViewBoundsToFrameTransform 5653.IBPluginDependency 5654.IBPluginDependency 5655.IBPluginDependency @@ -23694,7 +23831,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 5657.IBPluginDependency 5658.IBPluginDependency 5659.IBPluginDependency + 5659.IBViewBoundsToFrameTransform 5660.IBPluginDependency + 5660.IBViewBoundsToFrameTransform 5701.IBPluginDependency 5701.IBViewBoundsToFrameTransform 5701.ImportedFromIB2 @@ -24533,6 +24672,12 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7794.IBPluginDependency 7795.IBPluginDependency 7796.IBPluginDependency + 7798.IBPluginDependency + 7798.IBViewBoundsToFrameTransform + 7800.IBPluginDependency + 7801.IBPluginDependency + 7808.IBPluginDependency + 7809.IBPluginDependency 858.IBPluginDependency 858.ImportedFromIB2 959.IBEditorWindowLastContentRect @@ -25133,27 +25278,23 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{610, 374}, {302, 307}} + {{495, 136}, {337, 369}} com.apple.InterfaceBuilder.CocoaPlugin - {{610, 374}, {302, 307}} + {{495, 136}, {337, 369}} com.apple.InterfaceBuilder.CocoaPlugin YES - - - 92 - 0 - - - - 266 - 0 - com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDYgAAwhwAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDBAAAwhwAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25165,7 +25306,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{698, 398}, {170, 88}} + {{1163, 138}, {170, 88}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25174,7 +25315,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{698, 368}, {170, 88}} + {{1163, 108}, {170, 88}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25204,6 +25345,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA {311, 112} {311, 112} com.apple.InterfaceBuilder.CocoaPlugin + + AUGIAABDDAAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25211,7 +25355,13 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUGIAABCRAAAA + com.apple.InterfaceBuilder.CocoaPlugin + + AUGIAABDZwAAA + com.apple.InterfaceBuilder.CocoaPlugin P4AAAL+AAABCqAAAwhwAAA @@ -26406,6 +26556,14 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUGwAABDagAAA + + 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 @@ -26443,7 +26601,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - 7797 + 7813 @@ -30918,6 +31076,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA addRelationTableBox columnPopUpButton confirmAddRelationButton + constraintName labelTextField onDeletePopUpButton onUpdatePopUpButton @@ -30939,6 +31098,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA NSPopUpButton NSButton NSTextField + NSTextField NSPopUpButton NSPopUpButton NSPopUpButton @@ -30961,6 +31121,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA addRelationTableBox columnPopUpButton confirmAddRelationButton + constraintName labelTextField onDeletePopUpButton onUpdatePopUpButton @@ -30996,6 +31157,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA confirmAddRelationButton NSButton + + constraintName + NSTextField + labelTextField NSTextField -- cgit v1.2.3