From 51881a8ae93b14ac7a3007bcd66bad670e91ba49 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Thu, 1 Jul 2010 06:22:02 +0000 Subject: =?UTF-8?q?=E2=80=A2=20after=20opening=20spfs=20file=20reset=20tab?= =?UTF-8?q?Bar=20by=20looking=20at=20setting=20for=20SPAlwaysShowWindowTab?= =?UTF-8?q?Bar=20=E2=80=A2=20fixed=20CSV=20Import=20file=20display=20in=20?= =?UTF-8?q?NSPathControl=20if=20SP=20runs=20localized=20-=20the=20problem?= =?UTF-8?q?=20is=20very=20likely=20a=20bug=20in=20[NSPathControl=20setURL:?= =?UTF-8?q?];=20that's=20why=20create=20a=20new=20temporary=20NSPathContro?= =?UTF-8?q?l=20and=20set=20the=20GUI's=20NSPathControl=20via=20[NSPathCont?= =?UTF-8?q?rol=20setPathComponentCells:[tempPathControl=20pathComponentCel?= =?UTF-8?q?ls]]=20-=20this=20should=20fix=20i751=20=E2=80=A2=20resized=20s?= =?UTF-8?q?ome=20components=20in=20CSV=20Import=20sheet=20to=20fit=20for?= =?UTF-8?q?=20localizations=20a=20bit=20better?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Interfaces/English.lproj/DataMigrationDialog.xib | 457 ++++++++++++++++++++--- Source/SPAppController.m | 6 +- Source/SPFieldMapperController.m | 8 +- 3 files changed, 425 insertions(+), 46 deletions(-) diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib index 7ba026ad..a9e589de 100644 --- a/Interfaces/English.lproj/DataMigrationDialog.xib +++ b/Interfaces/English.lproj/DataMigrationDialog.xib @@ -2,16 +2,17 @@ 1050 - 10D573 - 762 + 10F569 + 788 1038.29 - 460.00 + 461.00 com.apple.InterfaceBuilder.CocoaPlugin - 762 + 788 YES + YES @@ -50,7 +51,7 @@ {3.40282e+38, 3.40282e+38} {522, 348} - + 274 YES @@ -115,13 +116,13 @@ YES - 269 - {{175, 12}, {168, 17}} + 271 + {{12, 12}, {498, 17}} YES 68288064 - 272630784 + 138413056 CSV Import Field Mapping LucidaGrande @@ -518,7 +519,7 @@ 289 - {{343, 12}, {82, 32}} + {{303, 12}, {102, 32}} YES @@ -543,7 +544,7 @@ 289 - {{425, 12}, {83, 32}} + {{405, 12}, {102, 32}} 1 YES @@ -728,7 +729,7 @@ 289 - {{276, 102}, {94, 14}} + {{258, 102}, {112, 14}} YES @@ -758,10 +759,6 @@ 69336641 166400 - - - file://localhost/Applications/ - @@ -770,30 +767,6 @@ YES - - 67239488 - 132096 - Leopard - - - - - - file://localhost// - - - - 67239488 - 132096 - Applications - - - - - - file://localhost/Applications - - @@ -801,7 +774,7 @@ 292 - {{17, 100}, {188, 18}} + {{17, 100}, {225, 18}} YES @@ -910,7 +883,7 @@ 289 - {{253, 79}, {117, 14}} + {{213, 79}, {157, 14}} YES @@ -926,7 +899,7 @@ 289 - {{239, 12}, {82, 32}} + {{214, 12}, {82, 32}} YES @@ -1418,6 +1391,7 @@ {522, 348} + {{0, 0}, {1280, 778}} {522, 370} @@ -3430,9 +3404,9 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{222, 389}, {522, 348}} + {{125, 1}, {522, 348}} com.apple.InterfaceBuilder.CocoaPlugin - {{222, 389}, {522, 348}} + {{125, 1}, {522, 348}} {{387, 725}, {432, 282}} @@ -3759,6 +3733,13 @@ toggleCollapse: id + + toggleCollapse: + + toggleCollapse: + id + + IBProjectSource Source/TablesList.h @@ -3801,6 +3782,80 @@ id + + YES + + YES + doDecomposedStringWithCanonicalMapping: + doDecomposedStringWithCompatibilityMapping: + doPrecomposedStringWithCanonicalMapping: + doPrecomposedStringWithCompatibilityMapping: + doRemoveDiacritics: + doSelectionLowerCase: + doSelectionTitleCase: + doSelectionUpperCase: + doTranspose: + insertNULLvalue: + selectCurrentLine: + selectCurrentWord: + selectEnclosingBrackets: + + + YES + + doDecomposedStringWithCanonicalMapping: + id + + + doDecomposedStringWithCompatibilityMapping: + id + + + doPrecomposedStringWithCanonicalMapping: + id + + + doPrecomposedStringWithCompatibilityMapping: + id + + + doRemoveDiacritics: + id + + + doSelectionLowerCase: + id + + + doSelectionTitleCase: + id + + + doSelectionUpperCase: + id + + + doTranspose: + id + + + insertNULLvalue: + id + + + selectCurrentLine: + id + + + selectCurrentWord: + id + + + selectEnclosingBrackets: + id + + + IBProjectSource Source/SPTextViewAdditions.h @@ -3853,6 +3908,85 @@ id + + YES + + YES + addGlobalSourceVariable: + addGlobalValue: + advancedCheckboxValidation: + changeFieldAlignment: + changeHasHeaderCheckbox: + changeImportMethod: + changeTableTarget: + closeGlobalValuesSheet: + closeSheet: + goBackToFileChooser: + insertNULLValue: + openAdvancedSheet: + removeGlobalValue: + stepRow: + + + YES + + addGlobalSourceVariable: + id + + + addGlobalValue: + id + + + advancedCheckboxValidation: + id + + + changeFieldAlignment: + id + + + changeHasHeaderCheckbox: + id + + + changeImportMethod: + id + + + changeTableTarget: + id + + + closeGlobalValuesSheet: + id + + + closeSheet: + id + + + goBackToFileChooser: + id + + + insertNULLValue: + id + + + openAdvancedSheet: + id + + + removeGlobalValue: + id + + + stepRow: + id + + + YES @@ -3944,6 +4078,220 @@ id + + YES + + YES + addGlobalValueButton + addRemainingDataSwitch + advancedBox + advancedButton + advancedInsertView + advancedLabel + advancedReplaceView + advancedUpdateView + alignByPopup + alignByPopupLabel + customQueryInstance + delayedCheckBox + delayedReplaceCheckBox + fieldMapperTableScrollView + fieldMapperTableView + fieldMappingImportArray + fileSourcePath + globalValuesSheet + globalValuesTableView + highPriorityCheckBox + ignoreCheckBox + ignoreUpdateCheckBox + importButton + importFieldNamesHeaderSwitch + importMethodLabel + importMethodPopup + insertNULLValueButton + lowPriorityCheckBox + lowPriorityReplaceCheckBox + lowPriorityUpdateCheckBox + matchingNameMenuItem + onupdateCheckBox + onupdateTextView + recordCountLabel + removeGlobalValueButton + replaceAfterSavingCheckBox + rowDownButton + rowUpButton + skipexistingRowsCheckBox + tableTargetPopup + theDelegate + + + YES + + addGlobalValueButton + NSButton + + + addRemainingDataSwitch + id + + + advancedBox + id + + + advancedButton + id + + + advancedInsertView + id + + + advancedLabel + id + + + advancedReplaceView + id + + + advancedUpdateView + id + + + alignByPopup + NSPopUpButton + + + alignByPopupLabel + id + + + customQueryInstance + id + + + delayedCheckBox + id + + + delayedReplaceCheckBox + id + + + fieldMapperTableScrollView + id + + + fieldMapperTableView + NSTableView + + + 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 + + + onupdateCheckBox + id + + + onupdateTextView + SPTextView + + + recordCountLabel + id + + + removeGlobalValueButton + NSButton + + + replaceAfterSavingCheckBox + id + + + rowDownButton + id + + + rowUpButton + id + + + skipexistingRowsCheckBox + id + + + tableTargetPopup + NSPopUpButton + + + theDelegate + id + + + IBProjectSource Source/SPFieldMapperController.h @@ -3956,10 +4304,24 @@ showMySQLHelpForCurrentWord: id + + showMySQLHelpForCurrentWord: + + showMySQLHelpForCurrentWord: + id + + scrollView NSScrollView + + scrollView + + scrollView + NSScrollView + + IBUserSource @@ -4631,6 +4993,13 @@ showWindow: id + + showWindow: + + showWindow: + id + + IBFrameworkSource AppKit.framework/Headers/NSWindowController.h diff --git a/Source/SPAppController.m b/Source/SPAppController.m index 46709aac..2d719c95 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -406,8 +406,12 @@ // Select active tab [newWindowController selectTabAtIndex:[[window objectForKey:@"selectedTabIndex"] intValue]]; + // Reset setHideForSingleTab - [newWindowController setHideForSingleTab:YES]; + if([[NSUserDefaults standardUserDefaults] objectForKey:SPAlwaysShowWindowTabBar]) + [newWindowController setHideForSingleTab:[[NSUserDefaults standardUserDefaults] boolForKey:SPAlwaysShowWindowTabBar]]; + else + [newWindowController setHideForSingleTab:YES]; } diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index d6f8185e..9f77398d 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -82,7 +82,13 @@ { // Set source path - [fileSourcePath setURL:[NSURL fileURLWithPath:sourcePath]]; + // Note: [fileSourcePath setURL:[NSURL fileWithPath:sourcePath]] does NOT work + // if Sequel Pro runs localized. Reason unknown, it seems to be a NSPathControl bug. + // Ask HansJB for more info. + NSPathControl *pc = [[[NSPathControl alloc] initWithFrame:NSZeroRect] autorelease]; + [pc setURL:[NSURL fileURLWithPath:sourcePath]]; + if([pc pathComponentCells]) + [fileSourcePath setPathComponentCells:[pc pathComponentCells]]; [fileSourcePath setDoubleAction:@selector(goBackToFileChooser:)]; [onupdateTextView setDelegate:theDelegate]; -- cgit v1.2.3