From 3d6ee35bc6b8fa082e31761caef5276506e17707 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 4 Apr 2009 16:14:37 +0000 Subject: - Change the method of creating a new table to be the same as that when creating a new database by presenting a sheet, allowing the user to specify the table name and encoding. - Allowing the user to specify the table encoding partially addresses issue #161. - Implementing interface validation in the form of not allowing table creation without a name also removes the need for lots of error checking and presenting these errors to the user. - In addition to the above the ability to specify the initial field name, type and length (if applicable) of a new table can now be done on the same sheet, but is yet to be implemented. - Also did a general tidy up of TablesList.[hm]. --- Interfaces/English.lproj/DBView.xib | 1013 ++++++++++++++++++++++++++++++++++- 1 file changed, 999 insertions(+), 14 deletions(-) (limited to 'Interfaces/English.lproj') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 727f2cfa..589b22a2 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,13 +2,13 @@ 1050 - 9G2141 + 9G55 677 949.43 353.00 YES - + YES @@ -79,6 +79,7 @@ 4352 {194, 393} + YES @@ -175,6 +176,7 @@ {{1, 1}, {194, 393}} + @@ -190,6 +192,7 @@ -2147483392 {{175, 1}, {15, 481}} + _doScroller: 9.979253e-01 @@ -199,6 +202,7 @@ 256 {{-100, -100}, {141, 11}} + 257 _doScroller: @@ -207,6 +211,7 @@ {196, 395} + 530 @@ -229,6 +234,7 @@ 4352 {194, 123} + YES @@ -292,6 +298,7 @@ {{1, 1}, {194, 123}} + @@ -302,6 +309,7 @@ -2147483392 {{175, 1}, {15, 481}} + _doScroller: 9.979253e-01 @@ -311,6 +319,7 @@ 256 {{-100, -100}, {141, 11}} + 257 _doScroller: @@ -319,6 +328,7 @@ {{0, 404}, {196, 125}} + 530 @@ -329,12 +339,14 @@ {{-1, 22}, {196, 529}} + 292 {{0, -1}, {32, 25}} + YES -2080244224 @@ -363,6 +375,7 @@ 292 {{20, 0}, {46, 25}} + YES -2076049856 @@ -371,7 +384,7 @@ -2042609409 35 - + NSImage button_action @@ -386,10 +399,7 @@ 1048576 2147483647 - - NSImage - button_action - + _popUpItemAction: @@ -463,6 +473,7 @@ {{179, 0}, {15, 23}} + YES 130560 @@ -495,6 +506,7 @@ {{93, 0}, {86, 23}} + YES 130560 @@ -515,6 +527,7 @@ 292 {{61, -1}, {32, 25}} + YES -2080244224 @@ -537,6 +550,7 @@ {194, 550} + NSView @@ -549,6 +563,7 @@ 274 {{-7, -10}, {672, 564}} + YES @@ -2580,6 +2595,7 @@ {625, 14} + @@ -2638,6 +2654,7 @@ {{1, 1}, {625, 155}} + @@ -2652,6 +2669,7 @@ -2147483392 {{598, 1}, {15, 68}} + _doScroller: 1.000000e+00 @@ -2661,6 +2679,7 @@ 256 {{-100, -100}, {601, 11}} + 257 _doScroller: @@ -2670,6 +2689,7 @@ {627, 157} + 530 @@ -2679,6 +2699,7 @@ {627, 156} + NSView @@ -2701,12 +2722,14 @@ 4352 {625, 228} + YES 256 {625, 17} + @@ -2714,6 +2737,7 @@ -2147483392 {{-26, 0}, {16, 17}} + YES @@ -2757,6 +2781,7 @@ {{1, 17}, {625, 228}} + @@ -2767,6 +2792,7 @@ -2147483392 {{611, 17}, {15, 30}} + _doScroller: 9.375000e-01 @@ -2776,6 +2802,7 @@ -2147483392 {{1, 47}, {610, 15}} + 1 _doScroller: @@ -2790,6 +2817,7 @@ {{1, 0}, {625, 17}} + @@ -2799,6 +2827,7 @@ {627, 246} + 562 @@ -2813,6 +2842,7 @@ 268 {{156, 246}, {98, 22}} + YES -2076049856 @@ -2863,6 +2893,7 @@ 264 {{38, 246}, {108, 22}} + YES -2076049856 @@ -2945,6 +2976,7 @@ 268 {{-10, 245}, {46, 25}} + YES -2076049856 @@ -2953,7 +2985,10 @@ -2042609409 35 - + + NSImage + button_action + 400 @@ -2965,7 +3000,7 @@ 1048576 2147483647 - + _popUpItemAction: @@ -3156,6 +3191,7 @@ 265 {{528, 248}, {90, 17}} + YES -2080244224 @@ -3177,6 +3213,7 @@ 265 {{410, 248}, {110, 17}} + YES 604110336 @@ -3209,6 +3246,7 @@ {{32, 246}, {595, 23}} + YES 130560 @@ -3224,6 +3262,7 @@ {{0, 165}, {627, 269}} + NSView @@ -3236,6 +3275,7 @@ 266 {{242, 67}, {368, 14}} + YES 67239424 @@ -3252,6 +3292,7 @@ 264 {{17, 67}, {143, 14}} + YES 67239424 @@ -3272,6 +3313,7 @@ 274 {{17, 20}, {593, 43}} + YES 67239424 @@ -3286,15 +3328,18 @@ {{0, 443}, {627, 87}} + NSView {{6, 10}, {627, 530}} + {{10, 7}, {637, 544}} + Custom Query @@ -3680,17 +3725,20 @@ {{203, 0}, {660, 550}} + NSView {863, 550} + YES DBViewSplitter {863, 550} + {{0, 0}, {1440, 878}} {780, 502} @@ -7330,11 +7378,452 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {411, 341} + {411, 341} + + {{0, 0}, {1440, 878}} + {300, 222} + {3.40282e+38, 3.40282e+38} + + + 1 + 2 + {{343, 483}, {269, 112}} + 1886912512 + tableSheet + NSWindow + + View + + {292, 112} + {269, 112} + + + 256 + + YES + + + 256 + {{17, 75}, {95, 17}} + + YES + + 67239424 + 4194304 + Table Name: + + + + + + + + + 256 + {{17, 50}, {113, 17}} + + YES + + 67239424 + 4194304 + Table Encoding: + + + + + + + + + 258 + {{112, 77}, {137, 18}} + + YES + + -1804468671 + 4326400 + + + + YES + + + + + + + 259 + {{184, 13}, {70, 28}} + + 1 + YES + + 604110336 + 138018816 + Add + + 1 + + -2038284033 + 1 + + + DQ + 200 + 25 + + + + + 259 + {{116, 13}, {70, 28}} + + YES + + 67239424 + 138018816 + Cancel + + + -2038284033 + 1 + + + Gw + 200 + 25 + + + + + 258 + {{109, 48}, {143, 22}} + + YES + + -2076049856 + 132096 + + + -2038284033 + 1 + + + + + + 400 + 75 + + + Default + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + YES + YES + + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + UCS-2 Unicode (ucs2) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + UTF-8 Unicode (utf8) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + US ASCII (ascii) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + ISO Latin 1 (latin1) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Mac Roman (macroman) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Windows Latin 2 (cp1250) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + ISO Latin 2 (latin2) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Windows Arabic (cp1256) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + ISO Greek (greek) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + ISO Hebrew (hebrew) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + ISO Turkish (latin5) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Windows Baltic (cp1257) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Windows Cyrillic (cp1251) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Big5 Traditional Chinese (big5) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Shift-JIS Japanese (sjis) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + EUC-JP Japanese (ujis) + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + EUC-KR Korean (euckr) + + 2147483647 + + + _popUpItemAction: + + + + + 3 + YES + YES + 1 + + + + {269, 112} + - {{0, 0}, {1440, 878}} - {300, 222} - {3.40282e+38, 3.40282e+38} + {{0, 0}, {1680, 1028}} + {269, 134} + {292, 134} @@ -11985,6 +12474,62 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5319 + + + closeTableSheet: + + + + 5362 + + + + closeTableSheet: + + + + 5363 + + + + delegate + + + + 5364 + + + + tableNameField + + + + 5365 + + + + tableEncodingButton + + + + 5366 + + + + addTableButton + + + + 5367 + + + + tableSheet + + + + 5368 + @@ -16939,6 +17484,276 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 5322 + + + YES + + + + tableSheet + + + 5323 + + + YES + + + + + + + + + + + 5324 + + + YES + + + + + + 5325 + + + YES + + + + + + 5326 + + + YES + + + + + + 5327 + + + YES + + + + + + 5328 + + + YES + + + + + + 5329 + + + YES + + + + + + 5330 + + + + + 5331 + + + + + 5332 + + + + + 5333 + + + + + 5334 + + + YES + + + + + + 5335 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5336 + + + + + 5337 + + + + + 5338 + + + + + 5339 + + + + + 5340 + + + + + 5341 + + + + + 5342 + + + + + 5343 + + + + + 5344 + + + + + 5345 + + + + + 5346 + + + + + 5347 + + + + + 5348 + + + + + 5349 + + + + + 5350 + + + + + 5351 + + + + + 5352 + + + + + 5353 + + + + + 5354 + + + + + 5355 + + + + + 5356 + + + + + 5357 + + + + + 5358 + + + + + 5359 + + + + + 5360 + + + + + 5361 + + + @@ -17971,6 +18786,86 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5300.IBPluginDependency 5301.IBPluginDependency 5317.IBPluginDependency + 5322.IBEditorWindowLastContentRect + 5322.IBWindowTemplateEditedContentRect + 5322.ImportedFromIB2 + 5322.windowTemplate.hasMaxSize + 5322.windowTemplate.hasMinSize + 5322.windowTemplate.maxSize + 5322.windowTemplate.minSize + 5323.IBPluginDependency + 5323.ImportedFromIB2 + 5324.IBPluginDependency + 5324.ImportedFromIB2 + 5325.IBPluginDependency + 5325.ImportedFromIB2 + 5326.IBPluginDependency + 5326.ImportedFromIB2 + 5327.IBPluginDependency + 5327.ImportedFromIB2 + 5328.IBPluginDependency + 5328.ImportedFromIB2 + 5329.IBPluginDependency + 5329.ImportedFromIB2 + 5330.IBPluginDependency + 5331.IBPluginDependency + 5332.IBPluginDependency + 5333.IBPluginDependency + 5334.IBPluginDependency + 5335.IBEditorWindowLastContentRect + 5335.IBPluginDependency + 5335.ImportedFromIB2 + 5335.editorWindowContentRectSynchronizationRect + 5336.IBPluginDependency + 5336.ImportedFromIB2 + 5337.IBPluginDependency + 5337.ImportedFromIB2 + 5338.IBPluginDependency + 5338.ImportedFromIB2 + 5339.IBPluginDependency + 5339.ImportedFromIB2 + 5340.IBPluginDependency + 5340.ImportedFromIB2 + 5341.IBPluginDependency + 5341.ImportedFromIB2 + 5342.IBPluginDependency + 5342.ImportedFromIB2 + 5343.IBPluginDependency + 5343.ImportedFromIB2 + 5344.IBPluginDependency + 5344.ImportedFromIB2 + 5345.IBPluginDependency + 5345.ImportedFromIB2 + 5346.IBPluginDependency + 5346.ImportedFromIB2 + 5347.IBPluginDependency + 5347.ImportedFromIB2 + 5348.IBPluginDependency + 5348.ImportedFromIB2 + 5349.IBPluginDependency + 5349.ImportedFromIB2 + 5350.IBPluginDependency + 5350.ImportedFromIB2 + 5351.IBPluginDependency + 5351.ImportedFromIB2 + 5352.IBPluginDependency + 5352.ImportedFromIB2 + 5353.IBPluginDependency + 5353.ImportedFromIB2 + 5354.IBPluginDependency + 5354.ImportedFromIB2 + 5355.IBPluginDependency + 5355.ImportedFromIB2 + 5356.IBPluginDependency + 5356.ImportedFromIB2 + 5357.IBPluginDependency + 5357.ImportedFromIB2 + 5358.IBPluginDependency + 5358.ImportedFromIB2 + 5359.IBPluginDependency + 5359.ImportedFromIB2 + 5360.IBPluginDependency + 5361.IBPluginDependency 557.IBPluginDependency 557.ImportedFromIB2 565.IBEditorWindowLastContentRect @@ -19501,6 +20396,86 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{809, 307}, {269, 112}} + {{809, 307}, {269, 112}} + + + + {292, 112} + {269, 112} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{907, -2}, {228, 379}} + com.apple.InterfaceBuilder.CocoaPlugin + + {{67, 289}, {228, 362}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{456, 426}, {292, 112}} @@ -19772,7 +20747,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 5321 + 5368 @@ -20647,6 +21622,7 @@ Y2hhbmdlIHRoZSBvcmRlcg YES addTable: closeCopyTableSheet: + closeTableSheet: copyTable: removeTable: updateTables: @@ -20658,12 +21634,14 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id + id YES YES + addTableButton copyTableContentSwitch copyTableNameField copyTableSheet @@ -20673,6 +21651,9 @@ Y2hhbmdlIHRoZSBvcmRlcg tableDataInstance tableDocumentInstance tableDumpInstance + tableEncodingButton + tableNameField + tableSheet tableSourceInstance tableStatusInstance tableWindow @@ -20693,6 +21674,10 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id + id + id + id + id -- cgit v1.2.3