• further work on Rd file support

- some improvement for saving files, esp. for changing file types from R to Rd e.g.
• corrected misspelled 'Secction' 

git-svn-id: https://svn.r-project.org/R-packages/trunk/Mac-GUI@5997 694ef91d-65df-0310-b7bb-92e67a308ead

Author: Hans-Jörg Bibiko

RDocument.h

@@ -41,6 +41,7 @@
 
 	BOOL isEditable; // determines whether this document can be edited
 	BOOL isREdit; // set to YES by R_Edit to exit modal state on close
+	BOOL fileTypeWasChangedWhileSaving;
 
 	NSPopUpButton *encodingPopUp;
 

RDocument.m

@@ -56,6 +56,7 @@ - (id)init
 		isEditable=YES;
 		isREdit=NO;
 		myWinCtrl=nil;
+		fileTypeWasChangedWhileSaving = NO;
     }
     return self;
 }
@@ -120,9 +121,24 @@ - (void) setFileEncoding: (int) encoding
 
 - (void)didSaveSelector
 {
+
+	// Reopen file if file type was changed while saving
+	if(fileTypeWasChangedWhileSaving) {
+		NSError *theError = nil;
+		fileTypeWasChangedWhileSaving = NO;
+		[myWinCtrl close];
+		[[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:[self fileURL] display:YES error:&theError];
+		if (theError) {
+			NSLog(@"*** openDocumentWithContentsOfURL: failed with %@", theError);
+			NSBeep();
+		}
+		return;
+	}
+
 	// Remain focus on current document after closing SaveAs panel
 	[[myWinCtrl window] makeKeyWindow];
 	encodingPopUp = nil;
+
 }
 
 - (void)runModalSavePanelForSaveOperation:(NSSaveOperationType)saveOperation delegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(void *)contextInfo
@@ -144,6 +160,15 @@ - (BOOL)prepareSavePanel:(NSSavePanel *)savePanel
 		if(encodingPopUp) [encodingPopUp setEnabled:YES];
 		[savePanel setAllowsOtherFileTypes:YES];
 	}
+	else if(initialContentsType && [initialContentsType isEqualToString:ftRdDoc]) {
+		[savePanel setAllowedFileTypes:[NSArray arrayWithObject:@"Rd"]];
+		if (myWinCtrl)
+			[savePanel setAccessoryView:[[[NSDocumentController sharedDocumentController] class] encodingAccessory:(NSStringEncoding)documentEncoding 
+																							   includeDefaultEntry:NO 
+																									 encodingPopUp:&encodingPopUp]];
+		if(encodingPopUp) [encodingPopUp setEnabled:YES];
+		[savePanel setAllowsOtherFileTypes:YES];
+	}
 	else if(initialContentsType && [initialContentsType hasSuffix:@".rtf"]) {
 		[savePanel setAllowedFileTypes:[NSArray arrayWithObject:@"rtf"]];
 		[savePanel setAllowsOtherFileTypes:NO];
@@ -156,19 +181,35 @@ - (BOOL)prepareSavePanel:(NSSavePanel *)savePanel
 
 }
 
-- (BOOL)writeToFile:(NSString *)fileName ofType:(NSString *)docType {
+- (BOOL)writeToURL:(NSURL *)absoluteURL ofType:(NSString *)docType error:(NSError **)outError
+{
 
 	SLog(@"RDocument.writeToFile: %@ ofType: %@ ", fileName, docType);
 
-	if([[fileName lowercaseString] hasSuffix:@".rtf"]) {
+	NSString *oldFileType = (initialContentsType)?:ftRSource; 
+
+	if([[[absoluteURL absoluteString] lowercaseString] hasSuffix:@".rtf"]) {
 		SLog(@" - docType was changed to rtf due to file extension");
 		if(initialContentsType) [initialContentsType release], initialContentsType = nil;
 		initialContentsType = [[NSString stringWithString:@"public.rtf"] retain];
 	}
+	else if([[[absoluteURL absoluteString] lowercaseString] hasSuffix:@".rd"]) {
+		SLog(@" - docType was changed to Rd due to file extension");
+		if(initialContentsType) [initialContentsType release], initialContentsType = nil;
+		initialContentsType = [[NSString stringWithString:ftRdDoc] retain];
+		[self setFileType:ftRdDoc];
+	}
+	else {
+		if(initialContentsType) [initialContentsType release], initialContentsType = nil;
+		initialContentsType = [[NSString stringWithString:ftRSource] retain];
+		[self setFileType:ftRSource];
+	}
 
 	SLog(@" - used docType %@", (initialContentsType)?:ftRSource);
 
-	return [super writeToFile:fileName ofType:(initialContentsType)?:ftRSource];
+	fileTypeWasChangedWhileSaving = ([initialContentsType isEqualToString:oldFileType]) ? NO : YES;
+
+	return [super writeToURL:absoluteURL ofType:(initialContentsType)?:ftRSource error:outError];
 
 }
 

RdEditorToolbar.m

@@ -92,7 +92,7 @@ @implementation RdEditorToolbar
 		tiSecList = [[NSToolbarItem alloc] initWithItemIdentifier: RDETI_SecList];
 		[tiSecList setLabel:NLS(@"Sections")];
 		[tiSecList setPaletteLabel:NLS(@"Sections")];
-		[tiSecList setToolTip:NLS(@"List of Secctions")];
+		[tiSecList setToolTip:NLS(@"List of Sections")];
 		SLog(@" - tiSecList=%@, view=%@", tiSecList, myView);
 		[tiSecList setView:myView];
 		[tiSecList setMinSize:NSMakeSize(100,NSHeight([myView frame]))];