The R Project SVN R-packages

Rev

Rev 5721 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5721 Rev 5726
Line 183... Line 183...
183 
	if (flag)
 183 
	if (flag)
184 
		[internalOrExternal selectCellAtRow:0 column:0];
 184 
		[internalOrExternal selectCellAtRow:0 column:0];
185 
	else
 185 
	else
186 
		[internalOrExternal selectCellAtRow:0 column:1];
 186 
		[internalOrExternal selectCellAtRow:0 column:1];
187 
 
 187 
 
188 
	[editorFont setFont:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:RScriptEditorDefaultFont]]];
 188 
	NSData *encodedFont = [[NSUserDefaults standardUserDefaults] dataForKey:RScriptEditorDefaultFont];
- 
 
 189 
	if (encodedFont)
- 
 
 190 
		[editorFont setFont:[NSUnarchiver unarchiveObjectWithData:encodedFont]];
189 
	[showSyntaxColoring setEnabled:flag?NSOnState:NSOffState];
 191 
	[showSyntaxColoring setEnabled:flag?NSOnState:NSOffState];
190 
	[showBraceHighlighting setEnabled:flag?NSOnState:NSOffState];
 192 
	[showBraceHighlighting setEnabled:flag?NSOnState:NSOffState];
191 
	[showLineNumbers setEnabled:flag?NSOnState:NSOffState];
 193 
	[showLineNumbers setEnabled:flag?NSOnState:NSOffState];
192 
	[highlightInterval setEnabled:flag?NSOnState:NSOffState];
 194 
	[highlightInterval setEnabled:flag?NSOnState:NSOffState];
193 
	[enableLineWrapping setEnabled:flag?NSOnState:NSOffState];
 195 
	[enableLineWrapping setEnabled:flag?NSOnState:NSOffState];
Line 199... Line 201...
199 
	[editorFontSelectButton setEnabled:flag?NSOnState:NSOffState];
 201 
	[editorFontSelectButton setEnabled:flag?NSOnState:NSOffState];
200 
	[showArgsHints setEnabled:flag?NSOnState:NSOffState];
 202 
	[showArgsHints setEnabled:flag?NSOnState:NSOffState];
201 
	[showBraceHighlighting setEnabled:flag?NSOnState:NSOffState];
 203 
	[showBraceHighlighting setEnabled:flag?NSOnState:NSOffState];
202 
	[matchingPairs setEnabled:flag?NSOnState:NSOffState];
 204 
	[matchingPairs setEnabled:flag?NSOnState:NSOffState];
203 
	[hiliteCurrentLine setEnabled:flag?NSOnState:NSOffState];
 205 
	[hiliteCurrentLine setEnabled:flag?NSOnState:NSOffState];
- 
 
 206 
	[autosaveDocuments setEnabled:flag?NSOnState:NSOffState];
204 
	if (flag) {
 207 
	if (flag) {
205 
		[highlightIntervalText setTextColor:[NSColor blackColor]];
 208 
		[highlightIntervalText setTextColor:[NSColor blackColor]];
206 
		[highlightInterval setTextColor:[NSColor blackColor]];
 209 
		[highlightInterval setTextColor:[NSColor blackColor]];
207 
		[highlightIntervalTextUnit setTextColor:[NSColor blackColor]];
 210 
		[highlightIntervalTextUnit setTextColor:[NSColor blackColor]];
208 
		[highlightNoteText setTextColor:[NSColor blackColor]];
 211 
		[highlightNoteText setTextColor:[NSColor blackColor]];
Line 242... Line 245...
242 
 
 245 
 
243 
	[showSyntaxColoring setState:[Preferences flagForKey:showSyntaxColoringKey withDefault: YES]?NSOnState:NSOffState];
 246 
	[showSyntaxColoring setState:[Preferences flagForKey:showSyntaxColoringKey withDefault: YES]?NSOnState:NSOffState];
244 
 
 247 
 
245 
	[showBraceHighlighting setState:[Preferences flagForKey:showBraceHighlightingKey withDefault: YES]?NSOnState:NSOffState];
 248 
	[showBraceHighlighting setState:[Preferences flagForKey:showBraceHighlightingKey withDefault: YES]?NSOnState:NSOffState];
246 
 
 249 
 
- 
 
 250 
	[autosaveDocuments setState:[Preferences flagForKey:kEditorAutosaveKey withDefault: YES] ? NSOnState : NSOffState];
- 
 
 251 
 
247 
	// since 1.40 highlightIntervalKey is obsolete since it contains space in its name
 252 
	// since 1.40 highlightIntervalKey is obsolete since it contains space in its name
248 
	// which isn't allowed for key-value-bindings; instead using HighlightIntervalKey
 253 
	// which isn't allowed for key-value-bindings; instead using HighlightIntervalKey
249 
	if([[NSUserDefaults standardUserDefaults] objectForKey:highlightIntervalKey]) {
 254 
	if([[NSUserDefaults standardUserDefaults] objectForKey:highlightIntervalKey]) {
250 
		[[NSUserDefaults standardUserDefaults] setFloat:[[Preferences stringForKey:highlightIntervalKey] doubleValue] forKey:HighlightIntervalKey];
 255 
		[[NSUserDefaults standardUserDefaults] setFloat:[[Preferences stringForKey:highlightIntervalKey] doubleValue] forKey:HighlightIntervalKey];
251 
		[[NSUserDefaults standardUserDefaults] removeObjectForKey:highlightIntervalKey];
 256 
		[[NSUserDefaults standardUserDefaults] removeObjectForKey:highlightIntervalKey];
Line 322... Line 327...
322 
// 			interval = @"0.8";
 327 
// 			interval = @"0.8";
323 
// 	}
 328 
// 	}
324 
// 	[Preferences setKey:highlightIntervalKey withObject:interval];
 329 
// 	[Preferences setKey:highlightIntervalKey withObject:interval];
325 
// }
 330 
// }
326 
 
 331 
 
327 
- (IBAction) changeShowLineNumbers:(id)sender {
 332 
- (IBAction) changeFlag:(id)sender {
328 
	int tmp = (int)[sender state];
 333 
	int tmp = (int)[sender state];
329 
	BOOL flag = tmp?YES:NO;
 334 
	BOOL flag = tmp ? YES : NO;
- 
 
 335 
	NSString *key = nil;
- 
 
 336 
	if (sender == autosaveDocuments) key = kEditorAutosaveKey;
- 
 
 337 
	if (sender == showLineNumbers)   key = showLineNumbersKey;
- 
 
 338 
	if (sender == matchingPairs)     key = kAutoCloseBrackets;
- 
 
 339 
	if (key)
330 
	[Preferences setKey:showLineNumbersKey withFlag:flag];
 340 
		[Preferences setKey:key withFlag:flag];
- 
 
 341 
	else {
- 
 
 342 
		SLog(@"WARNING: changeFlag called by %@ which corresponds to no key!", sender);
- 
 
 343 
	}
331 
}
 344 
}
332 
 
 345 
 
333 
- (IBAction) changeMatchingPairs:(id)sender {
 346 
- (IBAction) changeMatchingPairs:(id)sender {
334 
	int tmp = (int)[sender state];
 347 
	int tmp = (int)[sender state];
335 
	BOOL flag = tmp?YES:NO;
 348 
	BOOL flag = tmp?YES:NO;