From 6770f1b6d9aa0f677daf73daa51e5c2da27ba86f Mon Sep 17 00:00:00 2001 From: dmoagx Date: Fri, 17 Sep 2010 20:24:01 +0000 Subject: * Fixes minor label length issues and one unlocalized string --- Interfaces/English.lproj/DataMigrationDialog.xib | 617 ++--------------------- Interfaces/English.lproj/ImportAccessory.xib | 44 +- Source/SPFieldMapperController.m | 8 +- 3 files changed, 72 insertions(+), 597 deletions(-) diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib index 3aab9987..987df035 100644 --- a/Interfaces/English.lproj/DataMigrationDialog.xib +++ b/Interfaces/English.lproj/DataMigrationDialog.xib @@ -13,6 +13,7 @@ YES + YES @@ -48,10 +49,10 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {522, 348} - + 274 YES @@ -136,7 +137,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -517,6 +518,7 @@ {{1, 17}, {522, 126}} + 6 @@ -556,6 +558,7 @@ {{1, 0}, {522, 17}} + 4 @@ -564,6 +567,7 @@ {{-1, 129}, {524, 144}} + 530 @@ -830,7 +834,7 @@ 292 - {{17, 100}, {225, 18}} + {{17, 100}, {238, 18}} YES @@ -1088,6 +1092,29 @@ 2322 + + YES + + YES + Apple HTML pasteboard type + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + Apple URL pasteboard type + CorePasteboardFlavorType 0x6D6F6F76 + NSColor pasteboard type + NSFilenamesPboardType + NSStringPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT RTFD pasteboard type + NeXT Rich Text Format v1.0 pasteboard type + NeXT TIFF v4.0 pasteboard type + NeXT font pasteboard type + NeXT ruler pasteboard type + WebURLsWithTitlesPboardType + public.url + + {400, 14} @@ -1169,6 +1196,7 @@ {{1, 1}, {400, 37}} + @@ -1202,6 +1230,7 @@ {{20, 20}, {402, 39}} + 530 @@ -1504,10 +1533,11 @@ {522, 348} + {{0, 0}, {1280, 778}} {522, 370} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPCSVFieldMappingSheet @@ -1518,7 +1548,7 @@ Window NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {311, 186} @@ -1842,7 +1872,7 @@ {{0, 0}, {1280, 1002}} {311, 208} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -4111,6 +4141,7 @@ -3.IBPluginDependency 11.IBEditorWindowLastContentRect 11.IBPluginDependency + 11.IBViewEditorWindowController.showingBoundsRectangles 11.IBWindowTemplateEditedContentRect 11.ImportedFromIB2 11.editorWindowContentRectSynchronizationRect @@ -4340,9 +4371,10 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{94, 522}, {522, 348}} + {{457, 83}, {522, 348}} com.apple.InterfaceBuilder.CocoaPlugin - {{94, 522}, {522, 348}} + + {{457, 83}, {522, 348}} {{387, 725}, {432, 282}} @@ -4575,7 +4607,7 @@ SPTableView com.apple.InterfaceBuilder.CocoaPlugin - {{276, 527}, {303, 93}} + {{329, 527}, {303, 93}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6423,6 +6455,7 @@ newTableInfo: openAdvancedSheet: removeGlobalValue: + removeNewColumn: setAllTypesTo: stepRow: @@ -6447,6 +6480,7 @@ id id id + id @@ -6470,6 +6504,7 @@ newTableInfo: openAdvancedSheet: removeGlobalValue: + removeNewColumn: setAllTypesTo: stepRow: @@ -6543,6 +6578,10 @@ removeGlobalValue: id + + removeNewColumn: + id + setAllTypesTo: id @@ -7492,564 +7531,6 @@ - - YES - - SPFieldMapperController - NSWindowController - - YES - - YES - addGlobalSourceVariable: - addGlobalValue: - addNewColumn: - advancedCheckboxValidation: - changeFieldAlignment: - changeHasHeaderCheckbox: - changeImportMethod: - changeTableTarget: - closeGlobalValuesSheet: - closeInfoSheet: - closeSheet: - goBackToFileChooser: - insertNULLValue: - newTable: - newTableInfo: - openAdvancedSheet: - removeGlobalValue: - removeNewColumn: - setAllTypesTo: - stepRow: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - addGlobalSourceVariable: - addGlobalValue: - addNewColumn: - advancedCheckboxValidation: - changeFieldAlignment: - changeHasHeaderCheckbox: - changeImportMethod: - changeTableTarget: - closeGlobalValuesSheet: - closeInfoSheet: - closeSheet: - goBackToFileChooser: - insertNULLValue: - newTable: - newTableInfo: - openAdvancedSheet: - removeGlobalValue: - removeNewColumn: - setAllTypesTo: - stepRow: - - - YES - - addGlobalSourceVariable: - id - - - addGlobalValue: - id - - - addNewColumn: - id - - - advancedCheckboxValidation: - id - - - changeFieldAlignment: - id - - - changeHasHeaderCheckbox: - id - - - changeImportMethod: - id - - - changeTableTarget: - id - - - closeGlobalValuesSheet: - id - - - closeInfoSheet: - id - - - closeSheet: - id - - - goBackToFileChooser: - id - - - insertNULLValue: - id - - - newTable: - id - - - newTableInfo: - id - - - openAdvancedSheet: - id - - - removeGlobalValue: - id - - - removeNewColumn: - id - - - setAllTypesTo: - id - - - stepRow: - id - - - - - YES - - YES - addGlobalValueButton - addNewColumnMenuItem - addRemainingDataSwitch - advancedBox - advancedButton - advancedInsertView - advancedLabel - advancedReplaceView - advancedUpdateView - alignByPopup - alignByPopupLabel - customQueryInstance - databaseDataInstance - delayedCheckBox - delayedReplaceCheckBox - fieldMapperTableScrollView - fieldMapperTableView - fieldMappingImportArray - fileSourcePath - globalValuesSheet - globalValuesTableView - highPriorityCheckBox - ignoreCheckBox - ignoreUpdateCheckBox - importButton - importFieldNamesHeaderSwitch - importMethodLabel - importMethodPopup - insertNULLValueButton - lowPriorityCheckBox - lowPriorityReplaceCheckBox - lowPriorityUpdateCheckBox - matchingNameMenuItem - newTableButton - newTableInfoEncodingPopup - newTableInfoEnginePopup - newTableInfoWindow - newTableNameInfoButton - newTableNameLabel - newTableNameTextField - onupdateCheckBox - onupdateTextView - recordCountLabel - removeGlobalValueButton - replaceAfterSavingCheckBox - rowDownButton - rowUpButton - setAllTypesToMenuItem - skipexistingRowsCheckBox - tableTargetPopup - tablesListInstance - theDelegate - typeComboxBox - - - YES - NSButton - NSMenuItem - id - id - id - id - id - id - id - NSPopUpButton - id - id - id - id - id - id - SPTableView - id - NSPathControl - id - NSTableView - id - id - id - id - id - id - NSPopUpButton - NSButton - id - id - id - NSMenuItem - NSButton - id - id - id - NSButton - NSTextField - NSTextField - id - SPTextView - id - NSButton - id - id - id - NSMenuItem - id - NSPopUpButton - id - id - NSComboBoxCell - - - - YES - - YES - addGlobalValueButton - addNewColumnMenuItem - addRemainingDataSwitch - advancedBox - advancedButton - advancedInsertView - advancedLabel - advancedReplaceView - advancedUpdateView - alignByPopup - alignByPopupLabel - customQueryInstance - databaseDataInstance - delayedCheckBox - delayedReplaceCheckBox - fieldMapperTableScrollView - fieldMapperTableView - fieldMappingImportArray - fileSourcePath - globalValuesSheet - globalValuesTableView - highPriorityCheckBox - ignoreCheckBox - ignoreUpdateCheckBox - importButton - importFieldNamesHeaderSwitch - importMethodLabel - importMethodPopup - insertNULLValueButton - lowPriorityCheckBox - lowPriorityReplaceCheckBox - lowPriorityUpdateCheckBox - matchingNameMenuItem - newTableButton - newTableInfoEncodingPopup - newTableInfoEnginePopup - newTableInfoWindow - newTableNameInfoButton - newTableNameLabel - newTableNameTextField - onupdateCheckBox - onupdateTextView - recordCountLabel - removeGlobalValueButton - replaceAfterSavingCheckBox - rowDownButton - rowUpButton - setAllTypesToMenuItem - skipexistingRowsCheckBox - tableTargetPopup - tablesListInstance - theDelegate - typeComboxBox - - - YES - - addGlobalValueButton - NSButton - - - addNewColumnMenuItem - NSMenuItem - - - addRemainingDataSwitch - id - - - advancedBox - id - - - advancedButton - id - - - advancedInsertView - id - - - advancedLabel - id - - - advancedReplaceView - id - - - advancedUpdateView - id - - - alignByPopup - NSPopUpButton - - - alignByPopupLabel - id - - - customQueryInstance - id - - - databaseDataInstance - id - - - delayedCheckBox - id - - - delayedReplaceCheckBox - id - - - fieldMapperTableScrollView - id - - - fieldMapperTableView - SPTableView - - - fieldMappingImportArray - id - - - fileSourcePath - NSPathControl - - - globalValuesSheet - id - - - globalValuesTableView - NSTableView - - - highPriorityCheckBox - id - - - ignoreCheckBox - id - - - ignoreUpdateCheckBox - id - - - importButton - id - - - importFieldNamesHeaderSwitch - id - - - importMethodLabel - id - - - importMethodPopup - NSPopUpButton - - - insertNULLValueButton - NSButton - - - lowPriorityCheckBox - id - - - lowPriorityReplaceCheckBox - id - - - lowPriorityUpdateCheckBox - id - - - matchingNameMenuItem - NSMenuItem - - - newTableButton - NSButton - - - newTableInfoEncodingPopup - id - - - newTableInfoEnginePopup - id - - - newTableInfoWindow - id - - - newTableNameInfoButton - NSButton - - - newTableNameLabel - NSTextField - - - newTableNameTextField - NSTextField - - - onupdateCheckBox - id - - - onupdateTextView - SPTextView - - - recordCountLabel - id - - - removeGlobalValueButton - NSButton - - - replaceAfterSavingCheckBox - id - - - rowDownButton - id - - - rowUpButton - id - - - setAllTypesToMenuItem - NSMenuItem - - - skipexistingRowsCheckBox - id - - - tableTargetPopup - NSPopUpButton - - - tablesListInstance - id - - - theDelegate - id - - - typeComboxBox - NSComboBoxCell - - - - - IBDocumentRelativeSource - ../../Source/SPFieldMapperController.h - - - YES diff --git a/Interfaces/English.lproj/ImportAccessory.xib b/Interfaces/English.lproj/ImportAccessory.xib index 2455c78a..af4094d1 100644 --- a/Interfaces/English.lproj/ImportAccessory.xib +++ b/Interfaces/English.lproj/ImportAccessory.xib @@ -12,6 +12,7 @@ YES + @@ -46,9 +47,8 @@ 264 - {{189, 76}, {156, 26}} + {{208, 76}, {206, 26}} - YES -2076049856 @@ -100,9 +100,8 @@ 264 - {{17, 82}, {170, 17}} + {{36, 82}, {170, 17}} - YES 68288064 @@ -116,7 +115,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -145,7 +144,6 @@ 264 {{22, 54}, {411, 18}} - YES -2080244224 @@ -173,7 +171,6 @@ 268 {{169, 2}, {54, 22}} - YES 343014977 @@ -281,7 +278,6 @@ 268 {{2, 7}, {162, 14}} - YES 68288064 @@ -298,7 +294,6 @@ 265 {{380, 27}, {54, 22}} - YES 343014977 @@ -381,7 +376,6 @@ 265 {{232, 32}, {143, 14}} - YES 68288064 @@ -398,7 +392,6 @@ 265 {{380, 2}, {54, 22}} - YES 343014977 @@ -482,7 +475,6 @@ 265 {{232, 7}, {143, 14}} - YES 68288064 @@ -499,7 +491,6 @@ 268 {{169, 27}, {54, 22}} - YES 343014977 @@ -585,7 +576,6 @@ 268 {{2, 32}, {162, 14}} - YES 68288064 @@ -600,12 +590,10 @@ {456, 72} - {{-3, 1}, {456, 72}} - {0, 0} 67239424 @@ -627,9 +615,8 @@ 264 - {{189, 104}, {156, 26}} + {{208, 104}, {206, 26}} - YES -2076049856 @@ -682,9 +669,8 @@ 264 - {{17, 110}, {170, 17}} + {{36, 110}, {170, 17}} - YES 68288064 @@ -699,7 +685,6 @@ {450, 135} - NSView @@ -716,7 +701,7 @@ Window NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {500, 353} @@ -960,7 +945,7 @@ {{0, 0}, {1280, 778}} {500, 375} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -1609,7 +1594,7 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{168, 334}, {450, 135}} + {{516, 356}, {450, 135}} com.apple.InterfaceBuilder.CocoaPlugin @@ -1681,9 +1666,9 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{404, 193}, {500, 412}} + {{542, 399}, {500, 412}} com.apple.InterfaceBuilder.CocoaPlugin - {{404, 193}, {500, 412}} + {{542, 399}, {500, 412}} {500, 353} @@ -2900,6 +2885,13 @@ Print.framework/Headers/PDEPluginInterface.h + + NSObject + + IBFrameworkSource + PrintCore.framework/Headers/PDEPluginInterface.h + + NSObject diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index fe60c5d3..6adbcf46 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -32,6 +32,8 @@ #import "SPNotLoaded.h" #import "SPTextView.h" +#define SP_NUMBER_OF_RECORDS_STRING NSLocalizedString(@"%ld of %@%lu records", @"Label showing the index of the selected CSV row") + @implementation SPFieldMapperController @synthesize sourcePath; @@ -579,7 +581,7 @@ [self setupFieldMappingArray]; [rowDownButton setEnabled:NO]; [rowUpButton setEnabled:([fieldMappingImportArray count] > 1)]; - [recordCountLabel setStringValue:[NSString stringWithFormat:@"%ld of %@%lu records", (long)(fieldMappingCurrentRow+1), fieldMappingImportArrayIsPreview?@"first ":@"", (unsigned long)[fieldMappingImportArray count]]]; + [recordCountLabel setStringValue:[NSString stringWithFormat:SP_NUMBER_OF_RECORDS_STRING, (long)(fieldMappingCurrentRow+1), fieldMappingImportArrayIsPreview?@"first ":@"", (unsigned long)[fieldMappingImportArray count]]]; [self updateFieldMappingButtonCell]; [self updateFieldMappingOperatorOptions]; @@ -723,7 +725,7 @@ [fieldMapperTableView reloadData]; - [recordCountLabel setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%ld of %@%lu records", @"%ld of %@%lu records"), (long)(fieldMappingCurrentRow+1), fieldMappingImportArrayIsPreview?@"first ":@"", (unsigned long)[fieldMappingImportArray count]]]; + [recordCountLabel setStringValue:[NSString stringWithFormat:SP_NUMBER_OF_RECORDS_STRING, (long)(fieldMappingCurrentRow+1), fieldMappingImportArrayIsPreview?@"first ":@"", (unsigned long)[fieldMappingImportArray count]]]; // enable/disable buttons [rowDownButton setEnabled:(fieldMappingCurrentRow != 0)]; @@ -880,7 +882,7 @@ [self setupFieldMappingArray]; [rowDownButton setEnabled:NO]; [rowUpButton setEnabled:([fieldMappingImportArray count] > 1)]; - [recordCountLabel setStringValue:[NSString stringWithFormat:@"%ld of %@%lu records", (long)(fieldMappingCurrentRow+1), fieldMappingImportArrayIsPreview?@"first ":@"", (unsigned long)[fieldMappingImportArray count]]]; + [recordCountLabel setStringValue:[NSString stringWithFormat:SP_NUMBER_OF_RECORDS_STRING, (long)(fieldMappingCurrentRow+1), fieldMappingImportArrayIsPreview?@"first ":@"", (unsigned long)[fieldMappingImportArray count]]]; [self updateFieldMappingButtonCell]; [self updateFieldMappingOperatorOptions]; -- cgit v1.2.3