From 22ae0fa8c302d22071116abca27d2add3a0af991 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Tue, 16 Feb 2010 11:23:45 +0000 Subject: =?UTF-8?q?=E2=80=A2=20re-factored=20and=20outsourced=20the=20enti?= =?UTF-8?q?re=20CSV=20import=20field=20mapper=20sheet=20-=20changed=20the?= =?UTF-8?q?=20way=20to=20choose=20whether=20a=20source=20field=20should=20?= =?UTF-8?q?be=20imported=20or=20not=20by=20introducing=20a=20new=20table?= =?UTF-8?q?=20column=20'operators'=20-=20clicking=20at=20the=20'operator's?= =?UTF-8?q?=20header=20toggles=20all=20operators=20to=20'Import'=20or=20'D?= =?UTF-8?q?o=20not=20import'=20-=20added=20tooltips=20for=20each=20table?= =?UTF-8?q?=20cell;=20if=20file's=20first=20line=20are=20the=20headers=20s?= =?UTF-8?q?how=20them=20in=20the=20tooltips=20as=20well=20-=20added=20chec?= =?UTF-8?q?kbox=20"First=20line=20contains=20fields=20names"=20since=20it'?= =?UTF-8?q?ll=20be=20clear=20in=20this=20pane=20whether=20a=20file=20has?= =?UTF-8?q?=20a=20header=20line=20or=20not=20(will=20be=20sync=20with=20pr?= =?UTF-8?q?efs)=20-=20added=20the=20possibility=20to=20choose=20the=20impo?= =?UTF-8?q?rt=20method:=20INSERT=20INTO=20or=20REPLACE=20INTO=20=E2=80=A2?= =?UTF-8?q?=20deleted=20all=20old=20field=20mapper=20stuff=20from=20TableD?= =?UTF-8?q?ump=20and=20DBView.xib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notes: - tests are needed to be sure that this change does not cause mismatches while importing - symbols for Do (not) import are tendative - maybe use images - a further import method UPDATE plus an operator '=' will be added soon - chance to add a new global source variable will come soon - displaying of source field types will come soon - semi-automatically matching of source field names and header names will come soon - the GUI needs some improvements afterwards --- Interfaces/English.lproj/DataMigrationDialog.xib | 609 +++++++++++------------ 1 file changed, 283 insertions(+), 326 deletions(-) (limited to 'Interfaces/English.lproj/DataMigrationDialog.xib') diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib index a6a2b81e..23579daf 100644 --- a/Interfaces/English.lproj/DataMigrationDialog.xib +++ b/Interfaces/English.lproj/DataMigrationDialog.xib @@ -41,7 +41,7 @@ 15 2 - {{262, 452}, {465, 311}} + {{262, 438}, {465, 325}} 1886912512 CSV Field Mapping NSWindow @@ -68,7 +68,7 @@ 269 - {{179, 10}, {93, 17}} + {{179, 12}, {93, 17}} YES @@ -102,11 +102,11 @@ - {{1, 1}, {465, 34}} + {{1, 1}, {465, 39}} - {{-1, 276}, {467, 36}} + {{-1, 285}, {467, 41}} {0, 0} @@ -175,13 +175,13 @@ YES import_value - 216 + 212 15 1000 75628096 - 67110912 - + 2048 + Source Fields 3 @@ -194,14 +194,48 @@ - - 338820672 - 132096 - Text Cell + + -2076049856 + 133120 - - + 100679935 + 129 + + + 400 + 75 + + + Pop Up + + 1048576 + 2147483647 + 1 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + + 3 + YES + YES + 1 3 YES @@ -210,21 +244,21 @@ operator - 20 - 20 - 1000 + 28 + 28 + 28 75628096 134219776 - + →× - + -2076049856 - 134350848 - + 134219776 + 100679935 129 @@ -232,16 +266,27 @@ 400 75 - + + + Pop Up + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + YES - + OtherViews YES + - -1 3 YES YES @@ -251,13 +296,13 @@ target_field - 220 + 216 10 3.4028234663852886e+38 75628096 2048 - + Target Fields 6 @@ -267,19 +312,43 @@ - - 69336641 - 137216 - Text Cell + + -2076049856 + 133120 - - 6 - System - controlBackgroundColor - + 100679935 + 129 + + + 400 + 75 + + + YES + Pop Up + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + - + YES + 3 + YES + YES 3 YES @@ -323,7 +392,12 @@ - + + 6 + System + controlBackgroundColor + + 6 @@ -363,7 +437,7 @@ - {{-1, 77}, {467, 159}} + {{-1, 91}, {467, 159}} 530 @@ -377,7 +451,7 @@ 289 - {{286, 12}, {82, 32}} + {{286, 14}, {82, 32}} YES @@ -402,7 +476,7 @@ 289 - {{368, 12}, {83, 32}} + {{368, 14}, {83, 32}} 1 YES @@ -425,7 +499,7 @@ 292 - {{20, 17}, {32, 24}} + {{20, 19}, {32, 24}} YES @@ -449,7 +523,7 @@ 292 - {{51, 17}, {32, 24}} + {{51, 19}, {32, 24}} 1 YES @@ -475,7 +549,7 @@ 290 - {{88, 22}, {199, 14}} + {{88, 24}, {199, 14}} YES @@ -491,7 +565,7 @@ 267 - {{238, 237}, {220, 22}} + {{244, 255}, {215, 22}} YES @@ -522,8 +596,8 @@ - 292 - {{103, 46}, {126, 22}} + 289 + {{357, 61}, {91, 22}} YES @@ -537,22 +611,15 @@ 400 75 - + - UPDATE + INSERT 2147483647 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - + + _popUpItemAction: - 2 YES @@ -560,31 +627,32 @@ OtherViews YES - + + - INSERT + REPLACE 2147483647 - - + + _popUpItemAction: + 1 - + - REPLACE + YES + UPDATE 2147483647 - - + + _popUpItemAction: - 1 + 2 - - 2 1 YES YES @@ -593,8 +661,8 @@ - 292 - {{17, 51}, {94, 14}} + 289 + {{261, 66}, {94, 14}} YES @@ -618,7 +686,7 @@ NSFilenamesPboardType - {{5, 239}, {212, 20}} + {{5, 257}, {212, 20}} YES @@ -664,48 +732,43 @@ - + - 267 - {{322, 261}, {43, 14}} - - YES - - 68288064 - 272761856 - Target: - - - - - - - - - 270 - {{88, 261}, {44, 14}} + 292 + {{17, 64}, {188, 18}} YES - - 68288064 - 272761856 - Source: + + -2080244224 + 131072 + First line contains fields names - - - + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 - {465, 311} + {465, 325} {{0, 0}, {1280, 1002}} {465, 333} {3.40282e+38, 3.40282e+38} - - TableDump + + YES @@ -815,14 +878,6 @@ 72 - - - window - - - - 76 - closeSheet: @@ -839,6 +894,30 @@ 84 + + + nextKeyView + + + + 98 + + + + importFieldNamesHeaderSwitch + + + + 113 + + + + window + + + + 119 + @@ -888,13 +967,12 @@ - - - - + + + @@ -1115,7 +1193,7 @@ YES - + @@ -1124,7 +1202,7 @@ YES - + @@ -1133,84 +1211,111 @@ YES - + - 49 - - + 56 + + + YES + + + - 50 - + 57 + + + + + 89 + + + YES + + - 51 - + 90 + YES - + - + + + + 91 + + - 52 - + 92 + YES + - + - 56 - + 93 + YES - + - + - 57 - - + 94 + + - 80 - - - TableDump + 95 + + + YES + + + - 85 - + 96 + YES - + - + + + + 97 + + - 86 - - + 99 + + - 87 - + 111 + YES - + - 88 - - + 112 + + @@ -1228,6 +1333,8 @@ 11.windowTemplate.hasMinSize 11.windowTemplate.maxSize 11.windowTemplate.minSize + 111.IBPluginDependency + 112.IBPluginDependency 12.IBPluginDependency 12.ImportedFromIB2 13.IBPluginDependency @@ -1274,25 +1381,27 @@ 47.IBPluginDependency 47.ImportedFromIB2 48.IBPluginDependency - 49.IBPluginDependency - 50.IBPluginDependency - 50.IBShouldRemoveOnLegacySave - 51.IBPluginDependency - 52.IBEditorWindowLastContentRect - 52.IBPluginDependency 56.IBPluginDependency 57.IBPluginDependency - 85.IBPluginDependency - 86.IBPluginDependency - 87.IBPluginDependency - 88.IBPluginDependency + 89.IBPluginDependency + 90.IBEditorWindowLastContentRect + 90.IBPluginDependency + 91.IBPluginDependency + 92.IBPluginDependency + 93.IBEditorWindowLastContentRect + 93.IBPluginDependency + 94.IBPluginDependency + 95.IBPluginDependency + 96.IBPluginDependency + 97.IBPluginDependency + 99.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin - {{139, 173}, {465, 311}} + {{180, 351}, {465, 325}} com.apple.InterfaceBuilder.CocoaPlugin - {{139, 173}, {465, 311}} + {{180, 351}, {465, 325}} {{387, 725}, {432, 282}} @@ -1300,6 +1409,8 @@ {3.40282e+38, 3.40282e+38} {465, 311} com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1319,7 +1430,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{302, 438}, {126, 54}} + {{651, 435}, {95, 54}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1347,11 +1458,13 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{153, 554}, {423, 4}} + {{128, 372}, {465, 20}} + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{128, 372}, {465, 20}} + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1375,7 +1488,7 @@ - 88 + 119 @@ -1429,7 +1542,9 @@ YES fieldMapperTableView + fieldMappingImportArray fileSourcePath + importFieldNamesHeaderSwitch importMethodPopup recordCountLabel rowDownButton @@ -1441,165 +1556,7 @@ YES id id - id - id - id - id - id - id - - - - IBDocumentRelativeSource - ../../Source/SPFieldMapperController.h - - - - TableDump - NSObject - - YES - - YES - cancelProgressBar: - changeFormat: - changeTable: - closeFieldMapperSheet: - closeSheet: - panelSelectionDidChange: - reloadTables: - selectTables: - stepRow: - switchInput: - switchTab: - - - YES - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - addCreateTableSwitch - addDropTableSwitch - addErrorsSwitch - addTableContentSwitch - csvFullStreamingSwitch - customQueryInstance - errorsSheet - errorsView - exportCSVView - exportDumpTableView - exportDumpView - exportFieldNamesSwitch - exportFieldsEnclosedField - exportFieldsEscapedField - exportFieldsTerminatedField - exportLinesTerminatedField - exportMultipleCSVTableView - exportMultipleCSVView - exportMultipleFieldNamesSwitch - exportMultipleFieldsEnclosedField - exportMultipleFieldsEscapedField - exportMultipleFieldsTerminatedField - exportMultipleLinesTerminatedField - exportMultipleXMLTableView - exportMultipleXMLView - exportTabBar - exportTableList - exportToolbar - exportWindow - fieldMappingPopup - fieldMappingSheet - fieldMappingTableView - importCSVBox - importCSVView - importFieldNamesSwitch - importFieldsEnclosedField - importFieldsEscapedField - importFieldsTerminatedField - importFormatPopup - importLinesTerminatedField - multiCSVFullStreamingSwitch - multiXMLFullStreamingSwitch - recordCountLabel - rowDownButton - rowUpButton - singleProgressBar - singleProgressSheet - singleProgressText - singleProgressTitle - sqlFullStreamingSwitch - tableContentInstance - tableDataInstance - tableDocumentInstance - tableSourceInstance - tableWindow - tablesListInstance - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - NSPopUpButton - id - id - id - id - id - id - id - id - id - id + NSPathControl id id id @@ -1611,7 +1568,7 @@ IBDocumentRelativeSource - ../../Source/TableDump.h + ../../Source/SPFieldMapperController.h -- cgit v1.2.3